Fixed tests

malcolm/parts/ca/capart.py

@@ -50,7 +50,7 @@ def get_datatype(self):
         raise NotImplementedError
 
     @DefaultController.Resetting
-    def connect_pvs(self, task):
+    def connect_pvs(self, _):
         # release old monitor
         self.close_monitor()
         # make the connection in cothread's thread, use caget for initial value

tests/test_core/test_hook.py

@@ -54,16 +54,16 @@ def test_run_makes_correct_calls(self, task_mock):
         spawn_mock.return_value = spawned_mock
         process_mock.create_queue.return_value = queue_mock
         process_mock.spawn = spawn_mock
-        process_mock.q.get.return_value = (task_mock.return_value, MagicMock())
+        queue_mock.get.return_value = (task_mock.return_value, MagicMock())
         self.c.process = process_mock
         part1 = DummyPart1()
         part2 = DummyPart2()
-        self.c.parts = [part1, part2]
+        self.c.parts = dict(part1=part1, part2=part2)
 
         response = part1.do_thing.Hook.run(self.c)
 
         task_calls = [call[0][0] for call in task_mock.call_args_list]
-        self.assertEqual(task_calls, ["Configuring"]*2)
+        self.assertEqual(task_calls, ["Configuring.part1", "Configuring.part2"])
         task_calls = [call[0][1] for call in task_mock.call_args_list]
         self.assertEqual(task_calls, [self.c.process]*2)
         spawn_calls = [call[0] for call in spawn_mock.call_args_list]
@@ -74,7 +74,7 @@ def test_run_makes_correct_calls(self, task_mock):
                          (Hook._run_func, queue_mock, part2.do_all_the_things,
                           task_mock.return_value))
 
-        self.assertEqual(2, process_mock.q.get.call_count)
+        self.assertEqual(2, queue_mock.get.call_count)
 
         self.assertIsNone(response)
 
@@ -87,11 +87,11 @@ def test_run_stops_after_exception_raised(self, task_mock):
         spawn_mock.return_value = spawned_mock
         process_mock.spawn = spawn_mock
         process_mock.create_queue.return_value = queue_mock
-        process_mock.q.get.return_value = (task_mock.return_value, Exception())
+        queue_mock.get.return_value = (task_mock.return_value, Exception())
         self.c.process = process_mock
         part1 = DummyPart1()
         part2 = DummyPart2()
-        self.c.parts = [part1, part2]
+        self.c.parts = dict(part1=part1, part2=part2)
 
         with self.assertRaises(Exception):
             part1.do_thing.Hook.run(self.c)

tests/test_parts/test_ca/test_capart.py

@@ -69,7 +69,7 @@ def test_init_no_rbv(self):
     def test_reset(self):
         p = self.create_part()
         catools.caget.return_value = [caint(4), caint(5)]
-        p.connect_pvs()
+        p.connect_pvs("unused task object")
         catools.caget.assert_called_with(
             ["pv2", "pv"],
             format=catools.FORMAT_CTRL, datatype=p.get_datatype())