diff options
| author | Jan Safranek <jsafrane@redhat.com> | 2014-06-23 14:20:46 +0200 |
|---|---|---|
| committer | Jan Safranek <jsafrane@redhat.com> | 2014-06-23 14:20:46 +0200 |
| commit | cca4daf752e94d5d0c91cd50428c70273c50f169 (patch) | |
| tree | 3d84d03c4b713af79cb833dc0b8a610561abe5c4 | |
| parent | 652932b879325405c2e8260d5ff22fb29f85c518 (diff) | |
| download | openlmi-providers-cca4daf752e94d5d0c91cd50428c70273c50f169.tar.gz openlmi-providers-cca4daf752e94d5d0c91cd50428c70273c50f169.tar.xz openlmi-providers-cca4daf752e94d5d0c91cd50428c70273c50f169.zip | |
Fixed 'service xxx status' exit code checks.
There are differences on systems with systemd and with old SysV init.
| -rw-r--r-- | src/service-dbus/test/testService.py | 4 |
1 files changed, 3 insertions, 1 deletions
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"}) |