fixed unit tests for merge

1 files changed, 12 insertions, 13 deletions

diff --git a/testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py b/testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py
index 19f76f2f1..6fdafa2ab 100644
--- a/testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py
+++ b/testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py
@@ -399,9 +399,9 @@ class TestPkgTool(TestTool):
         def run(cmd):
             if "foo" in cmd:
                 # fail when installing all packages, and when installing foo
-                return (1, '')
+                return False
             # succeed otherwise
-            return (0, '')
+            return True
 
         pt.VerifyPackage.side_effect = lambda p, m: p.get("name") == "bar"
 
@@ -480,7 +480,7 @@ class TestSvcTool(TestTool):
         st.cmd = MagicMock()
         service = lxml.etree.Element("Service", name="foo", type="test")
         self.assertEqual(st.start_service(service),
-                         st.cmd.run.return_value[0])
+                         st.cmd.run.return_value)
         st.get_svc_command.assert_called_with(service, "start")
         st.cmd.run.assert_called_with(st.get_svc_command.return_value)
 
@@ -490,7 +490,7 @@ class TestSvcTool(TestTool):
         st.cmd = MagicMock()
         service = lxml.etree.Element("Service", name="foo", type="test")
         self.assertEqual(st.stop_service(service),
-                         st.cmd.run.return_value[0])
+                         st.cmd.run.return_value)
         st.get_svc_command.assert_called_with(service, "stop")
         st.cmd.run.assert_called_with(st.get_svc_command.return_value)
 
@@ -505,14 +505,14 @@ class TestSvcTool(TestTool):
 
         service = lxml.etree.Element("Service", name="foo", type="test")
         self.assertEqual(st.restart_service(service),
-                         st.cmd.run.return_value[0])
+                         st.cmd.run.return_value)
         st.get_svc_command.assert_called_with(service, "restart")
         st.cmd.run.assert_called_with(st.get_svc_command.return_value)
 
         reset()
         service.set('target', 'reload')
         self.assertEqual(st.restart_service(service),
-                         st.cmd.run.return_value[0])
+                         st.cmd.run.return_value)
         st.get_svc_command.assert_called_with(service, "reload")
         st.cmd.run.assert_called_with(st.get_svc_command.return_value)
 
@@ -526,14 +526,14 @@ class TestSvcTool(TestTool):
             st.get_svc_command.reset_mock()
             st.cmd.reset_mock()
 
-        st.cmd.run.return_value = (0, '')
-        self.assertEqual(st.check_service(service), True)
+        self.assertEqual(st.check_service(service),
+                         st.cmd.run.return_value)
         st.get_svc_command.assert_called_with(service, "status")
         st.cmd.run.assert_called_with(st.get_svc_command.return_value)
 
         reset()
-        st.cmd.run.return_value = (11, '')
-        self.assertEqual(st.check_service(service), False)
+        self.assertEqual(st.check_service(service),
+                         st.cmd.run.return_value)
         st.get_svc_command.assert_called_with(service, "status")
         st.cmd.run.assert_called_with(st.get_svc_command.return_value)
 
@@ -556,10 +556,9 @@ class TestSvcTool(TestTool):
         st.handlesEntry = Mock()
         st.handlesEntry.side_effect = lambda e: e.tag == "Service"
         st.stop_service = Mock()
-        st.stop_service.return_value = 0
+        st.stop_service.return_value = True
         st.restart_service = Mock()
-        st.restart_service.side_effect = lambda e: \
-            int(e.get("name") == "failed")
+        st.restart_service.side_effect = lambda e: e.get("name") != "failed"
 
         def reset():
             st.handlesEntry.reset_mock()