fix conflicts

Changelog: None Signed-off-by: Ole Petter <[email protected]>
ngen-brett · Jun 27, 2021 · f7c0b6f · f7c0b6f
1 parent dc7de31
commit f7c0b6f
Showing 1 changed file with 26 additions and 41 deletions.
diff --git a/app/updatemanager_test.go b/app/updatemanager_test.go
@@ -244,25 +244,18 @@ func TestDeleteAllPriorities(t *testing.T) {
 		conf.DefaultUpdateControlMapBootExpirationTimeSeconds,
 	)
 	testMapPool.Insert(&updatecontrolmap.UpdateControlMap{
-		UpdateControlMapData: updatecontrolmap.UpdateControlMapData{
-			ID:       "foo",
-			Priority: 1,
-		},
+		ID:       "foo",
+		Priority: 1,
 	})
 	testMapPool.Insert(&updatecontrolmap.UpdateControlMap{
-		UpdateControlMapData: updatecontrolmap.UpdateControlMapData{
-			ID:       "bar",
-			Priority: 2,
-		},
+		ID:       "bar",
+		Priority: 2,
 	})
 	testMapPool.Insert(&updatecontrolmap.UpdateControlMap{
-		UpdateControlMapData: updatecontrolmap.UpdateControlMapData{
-			ID:       "foo",
-			Priority: 3,
-		},
+		ID:       "foo",
+		Priority: 3,
 	})
 	testMapPool.DeleteAllPriorities("foo")
-======= end
 	active, expired := testMapPool.Get("foo")
 	assert.Equal(t, 0, len(active))
 	assert.Equal(t, 0, len(expired))
@@ -310,46 +303,38 @@ func TestInsertReplaceAllPriorities(t *testing.T) {
 		conf.DefaultUpdateControlMapBootExpirationTimeSeconds,
 	)
 	cm1 := &updatecontrolmap.UpdateControlMap{
-		UpdateControlMapData: updatecontrolmap.UpdateControlMapData{
-			ID:       TEST_UUID,
-			Priority: 1,
-			States: map[string]updatecontrolmap.UpdateControlMapState{
-				"ArtifactInstall": updatecontrolmap.UpdateControlMapState{
-					Action: "continue",
-				},
+		ID:       TEST_UUID,
+		Priority: 1,
+		States: map[string]updatecontrolmap.UpdateControlMapState{
+			"ArtifactInstall": updatecontrolmap.UpdateControlMapState{
+				Action: "continue",
 			},
 		},
 	}
 	cm2 := &updatecontrolmap.UpdateControlMap{
-		UpdateControlMapData: updatecontrolmap.UpdateControlMapData{
-			ID:       TEST_UUID,
-			Priority: 2,
-			States: map[string]updatecontrolmap.UpdateControlMapState{
-				"ArtifactReboot": updatecontrolmap.UpdateControlMapState{
-					Action: "continue",
-				},
+		ID:       TEST_UUID,
+		Priority: 2,
+		States: map[string]updatecontrolmap.UpdateControlMapState{
+			"ArtifactReboot": updatecontrolmap.UpdateControlMapState{
+				Action: "continue",
 			},
 		},
 	}
 	cm3 := &updatecontrolmap.UpdateControlMap{
-		UpdateControlMapData: updatecontrolmap.UpdateControlMapData{
-			ID:       TEST_UUID,
-			Priority: 3,
-			States: map[string]updatecontrolmap.UpdateControlMapState{
-				"ArtifactReboot": updatecontrolmap.UpdateControlMapState{
-					Action: "continue",
-				},
+		ID:       TEST_UUID,
+		Priority: 3,
+		States: map[string]updatecontrolmap.UpdateControlMapState{
+			"ArtifactReboot": updatecontrolmap.UpdateControlMapState{
+				Action: "continue",
 			},
 		},
 	}
 	cm4 := &updatecontrolmap.UpdateControlMap{
-		UpdateControlMapData: updatecontrolmap.UpdateControlMapData{
-			ID:       TEST_UUID,
-			Priority: 4,
-			States: map[string]updatecontrolmap.UpdateControlMapState{
-				"ArtifactReboot": updatecontrolmap.UpdateControlMapState{
-					Action: "continue",
-				},
+		ID:       TEST_UUID,
+		Priority: 4,
+		States: map[string]updatecontrolmap.UpdateControlMapState{
+			"ArtifactReboot": updatecontrolmap.UpdateControlMapState{
+				Action: "continue",
 			},
 		},
 	}