#566: removed QOIs from test harness

Author: ppebay

tests/unit/Execution/test_lbs_brute_force_algorithm.py

@@ -69,9 +69,7 @@ def setUp(self):
             "max_objects_per_transfer": 8,
             "deterministic_transfer": True
         },
-        lgr=self.logger,
-        rank_qoi=None,
-        object_qoi=None)
+        lgr=self.logger)
 
     self.brute_force = BruteForceAlgorithm(
         work_model=WorkModelBase(),
@@ -84,9 +82,7 @@ def setUp(self):
             "max_objects_per_transfer": 8,
             "deterministic_transfer": True
         },
-        lgr=self.logger,
-        rank_qoi=None,
-        object_qoi=None)
+        lgr=self.logger)
 
   def test_lbs_brute_force_skip_transfer(self):
     assert self.brute_force_skip_transfer._BruteForceAlgorithm__skip_transfer is True

tests/unit/Execution/test_lbs_centralized_prefix_optimizer_algorithm.py

@@ -66,16 +66,12 @@ def setUp(self):
             parameters={},
             lgr=self.logger)
         parameters = {"do_second_stage": True}
-        qoi_name = "load"
 
         # Create CPOA instance
         self.cpoa = CentralizedPrefixOptimizerAlgorithm(
-                        work_model=work_model,
-                        parameters=parameters,
-                        lgr=self.logger,
-                        qoi_name=qoi_name,
-                        obj_qoi=qoi_name
-        )
+            work_model=work_model,
+            parameters=parameters,
+            lgr=self.logger)
 
         # Set up phase
         self.sentinel_objects = {Object(seq_id=15, load=4.5), Object(seq_id=18, load=2.5)}

tests/unit/Execution/test_lbs_inform_and_transfer_algorithm.py

@@ -74,9 +74,7 @@ def setUp(self):
                 "max_objects_per_transfer": 8,
                 "deterministic_transfer": True
             },
-            lgr=self.logger,
-            rank_qoi=None,
-            object_qoi=None)
+            lgr=self.logger)
 
     @patch.object(random, "sample")
     def test_lbs_inform_and_transfer_forward_message(self, random_mock):
@@ -114,4 +112,4 @@ def test_lbs_inform_and_transfer_process_message(self):
         self.assertEqual(known_peers, {self.rank: {self.rank, temp_rank_1}})
 
 if __name__ == "__main__":
-    unittest.main()
+    unittest.main()

tests/unit/Execution/test_lbs_runtime.py

@@ -93,17 +93,25 @@ def setUp(self):
         n_ranks = 4
         self.arrangements = compute_min_max_arrangements_work(objects, alpha, beta, gamma,
                                                               n_ranks, logger=self.logger)[2]
-        self.rank_qoi = None
-        self.object_qoi = None
         # Initialize the Runtime instances
-        self.runtime = Runtime(self.phases, self.work_model, self.algorithm, self.arrangements, self.logger, self.rank_qoi, self.object_qoi)
+        self.runtime = Runtime(
+            self.phases,
+            self.work_model,
+            self.algorithm,
+            self.arrangements,
+            self.logger)
 
     def test_lbs_runtime_get_work_model(self):
         self.assertEqual(self.runtime.get_work_model().__class__, AffineCombinationWorkModel)
 
     def test_lbs_runtime_no_phases(self):
         with self.assertRaises(SystemExit) as context:
-            runtime = Runtime(None, self.work_model, self.algorithm, self.arrangements, self.logger, self.rank_qoi, self.object_qoi)
+            runtime = Runtime(
+                None,
+                self.work_model,
+                self.algorithm,
+                self.arrangements,
+                self.logger)
         self.assertEqual(context.exception.code, 1)
 
     def test_lbs_runtime_execute(self):