test fixups

Author: jgallagher

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

@@ -1442,7 +1442,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,
@@ -1456,7 +1456,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 = make_tuf_repo();
-        let updates = plan_mgs_updates(
+        let (updates, _host_phase_2) = plan_mgs_updates(
             log,
             &collection,
             current_boards,
@@ -1476,7 +1476,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,
@@ -1501,7 +1501,7 @@ mod test {
             ]),
             ExpectedVersion::NoValidVersion,
         );
-        let later_updates = plan_mgs_updates(
+        let (later_updates, _host_phase_2) = plan_mgs_updates(
             log,
             &later_collection,
             current_boards,
@@ -1526,7 +1526,7 @@ mod test {
             &BTreeMap::from([((SpType::Switch, 1), ARTIFACT_VERSION_1)]),
             ExpectedVersion::NoValidVersion,
         );
-        let later_updates = plan_mgs_updates(
+        let (later_updates, _host_phase_2) = plan_mgs_updates(
             log,
             &later_collection,
             current_boards,
@@ -1555,7 +1555,7 @@ mod test {
             &BTreeMap::new(),
             ExpectedVersion::NoValidVersion,
         );
-        let later_updates = plan_mgs_updates(
+        let (later_updates, _host_phase_2) = plan_mgs_updates(
             log,
             &updated_collection,
             current_boards,
@@ -1576,7 +1576,7 @@ mod test {
             &BTreeMap::from([((SpType::Sled, 0), ARTIFACT_VERSION_1)]),
             ExpectedVersion::NoValidVersion,
         );
-        let updates = plan_mgs_updates(
+        let (updates, _host_phase_2) = plan_mgs_updates(
             log,
             &collection,
             &BTreeSet::new(),
@@ -1586,7 +1586,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,
@@ -1627,7 +1627,7 @@ mod test {
             &BTreeMap::from([((SpType::Sled, 0), ARTIFACT_VERSION_1)]),
             ExpectedVersion::Version(ARTIFACT_VERSION_1),
         );
-        let new_updates = plan_mgs_updates(
+        let (new_updates, _host_phase_2) = plan_mgs_updates(
             log,
             &collection,
             &collection.baseboards,
@@ -1670,7 +1670,7 @@ mod test {
             &BTreeMap::from([((SpType::Sled, 0), ARTIFACT_VERSION_1_5)]),
             ExpectedVersion::NoValidVersion,
         );
-        let new_updates = plan_mgs_updates(
+        let (new_updates, _host_phase_2) = plan_mgs_updates(
             log,
             &collection,
             &collection.baseboards,