test fixups

Author: jgallagher

nexus/reconfigurator/planning/src/mgs_updates/mod.rs

@@ -1113,7 +1113,7 @@ mod test {
         let initial_updates = PendingMgsUpdates::new();
         let nmax_updates = 1;
         let impossible_update_policy = ImpossibleUpdatePolicy::Reevaluate;
-        let updates = plan_mgs_updates(
+        let (updates, _host_phase_2) = plan_mgs_updates(
             log,
             &collection,
             current_boards,
@@ -1127,7 +1127,7 @@ mod test {
         // Test that when a TUF repo is specified and one RoT is outdated, then
         // it's configured with an update (and the update looks correct).
         let repo = test_boards.tuf_repo();
-        let updates = plan_mgs_updates(
+        let (updates, _host_phase_2) = plan_mgs_updates(
             log,
             &collection,
             current_boards,
@@ -1150,7 +1150,7 @@ mod test {
         // Test that when an update is already pending, and nothing changes
         // about the state of the world (i.e., the inventory), then the planner
         // makes no changes.
-        let later_updates = plan_mgs_updates(
+        let (later_updates, _host_phase_2) = plan_mgs_updates(
             log,
             &collection,
             current_boards,
@@ -1172,7 +1172,7 @@ mod test {
             .stage0_version_exception(SpType::Sled, 0, ARTIFACT_VERSION_1)
             .stage0_version_exception(SpType::Switch, 1, ARTIFACT_VERSION_1)
             .build();
-        let later_updates = plan_mgs_updates(
+        let (later_updates, _host_phase_2) = plan_mgs_updates(
             log,
             &later_collection,
             current_boards,
@@ -1198,7 +1198,7 @@ mod test {
             .rot_active_version_exception(SpType::Switch, 1, ARTIFACT_VERSION_1)
             .stage0_version_exception(SpType::Switch, 1, ARTIFACT_VERSION_1)
             .build();
-        let later_updates = plan_mgs_updates(
+        let (later_updates, _host_phase_2) = plan_mgs_updates(
             log,
             &later_collection,
             current_boards,
@@ -1228,7 +1228,7 @@ mod test {
                 ExpectedVersion::NoValidVersion,
             )
             .build();
-        let later_updates = plan_mgs_updates(
+        let (later_updates, _host_phase_2) = plan_mgs_updates(
             log,
             &updated_collection,
             current_boards,
@@ -1248,7 +1248,7 @@ mod test {
             )
             .stage0_version_exception(SpType::Sled, 0, ARTIFACT_VERSION_1)
             .build();
-        let updates = plan_mgs_updates(
+        let (updates, _host_phase_2) = plan_mgs_updates(
             log,
             &collection,
             &BTreeSet::new(),
@@ -1258,7 +1258,7 @@ mod test {
             impossible_update_policy,
         );
         assert!(updates.is_empty());
-        let updates = plan_mgs_updates(
+        let (updates, _host_phase_2) = plan_mgs_updates(
             log,
             &collection,
             &collection.baseboards,
@@ -1301,7 +1301,7 @@ mod test {
             )
             .stage0_version_exception(SpType::Sled, 0, ARTIFACT_VERSION_1)
             .build();
-        let new_updates = plan_mgs_updates(
+        let (new_updates, _host_phase_2) = plan_mgs_updates(
             log,
             &collection,
             &collection.baseboards,
@@ -1342,7 +1342,7 @@ mod test {
             )
             .stage0_version_exception(SpType::Sled, 0, ARTIFACT_VERSION_1_5)
             .build();
-        let new_updates = plan_mgs_updates(
+        let (new_updates, _host_phase_2) = plan_mgs_updates(
             log,
             &collection,
             &collection.baseboards,
@@ -1678,7 +1678,7 @@ mod test {
                 ExpectedVersion::NoValidVersion,
             )
             .build();
-        let all_updates = plan_mgs_updates(
+        let (all_updates, _host_phase_2) = plan_mgs_updates(
             log,
             &collection,
             &collection.baseboards,
@@ -1714,7 +1714,7 @@ mod test {
                 ExpectedVersion::NoValidVersion,
             )
             .build();
-        let all_updates = plan_mgs_updates(
+        let (all_updates, _host_phase_2) = plan_mgs_updates(
             log,
             &collection,
             &collection.baseboards,