From cca4daf752e94d5d0c91cd50428c70273c50f169 Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Mon, 23 Jun 2014 14:20:46 +0200 Subject: Fixed 'service xxx status' exit code checks. There are differences on systems with systemd and with old SysV init. --- src/service-dbus/test/testService.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/service-dbus/test/testService.py b/src/service-dbus/test/testService.py index e258a4a..11fb069 100644 --- a/src/service-dbus/test/testService.py +++ b/src/service-dbus/test/testService.py @@ -210,7 +210,9 @@ class TestServiceProvider(lmibase.LmiTestCase): cmd = "service " + service_evil_name + " status" cmd = cmd.split() service_status = subprocess.call(cmd) - self.assertEqual(service_status, 3) + # on RHEL6 and older /bin/service returns '1' + # on RHEL7 (=systemd) it returns '3' + self.assertIn(service_status, (1,3)) # Try to get ..!non_exists">" service from OpenLMI service = self.cim_class.first_instance({"Name": service_evil_name + ".service"}) -- cgit