Update shutdown/restart unit tests

assert calls on dbus object
added clock advance for shutdown delay

landscape/client/manager/shutdownmanager.py

@@ -21,6 +21,9 @@ class ShutdownManager(ManagerPlugin):
     This is usually sufficent.
     """
 
+    callLater = reactor.callLater
+    shutdown_delay = 120
+
     def register(self, registry):
         super().register(registry)
         self.config = registry.config
@@ -75,7 +78,7 @@ def _respond_reboot_success(self, data, operation_id):
 
     def _respond_shutdown_success(self, data, operation_id):
         deferred = self._respond(SUCCEEDED, data, operation_id)
-        reactor.callLater(120, self._Shutdown)
+        self.callLater(self.shutdown_delay, self._Shutdown)
         deferred.addErrback(self._respond_fail)
         return deferred
 

landscape/client/manager/tests/test_shutdownmanager.py

@@ -1,4 +1,4 @@
-from unittest.mock import patch
+from unittest.mock import patch, Mock
 from twisted.internet import task
 
 from landscape.client.manager.shutdownmanager import ShutdownManager
@@ -20,27 +20,36 @@ def setUp(self):
 
         self.clock = task.Clock()
         self.plugin = ShutdownManager()
-        self.plugin.reactor = self.clock
-
         self.manager.add(self.plugin)
+        self.plugin.callLater = self.clock.callLater
+
+        self.dbus_mock = patch(
+            "landscape.client.manager.shutdownmanager.dbus").start()
+
+    def test_reboot(self):
+        bus_object = Mock()
+        self.dbus_mock.SystemBus.return_value = bus_object
 
-    @patch('landscape.client.manager.shutdownmanager.ShutdownManager._Reboot')
-    def test_reboot(self, mock_reboot):
         message = {"type": "shutdown", "reboot": True, "operation-id": 100}
         deferred = self.plugin._handle_shutdown(message)
 
-        mock_reboot.assert_called_once()
+        def check(_):
+            bus_object.get_object.assert_called_once()
+            bus_object.Reboot.assert_called_once()
+
         return deferred
 
-    @patch('landscape.client.manager.shutdownmanager.reactor')
-    def test_shutdown(self, mock_reactor):
+    def test_shutdown(self):
+        bus_object = Mock()
+        self.dbus_mock.SystemBus.return_value = bus_object
 
-        message = {"type": "shutdown", "reboot": False, "operation-id": 101}
-        self.plugin._handle_shutdown(message)
+        message = {"type": "shutdown", "reboot": False, "operation-id": 100}
+        deferred = self.plugin._handle_shutdown(message)
+
+        self.clock.advance(self.plugin.shutdown_delay)
 
-        mock_reactor.callLater.assert_called_once()
+        def check(_):
+            bus_object.get_object.assert_called_once()
+            bus_object.PowerOff.assert_called_once()
 
-        # check it was the shutdown method requested
-        arg = mock_reactor.callLater.call_args.args[1]
-        name = getattr(arg, "__name__", str(arg))
-        self.assertEqual(name, "_Shutdown")
+        return deferred