From fc0817cb3520fe36ea5072c8a4302932ab101761 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Thu, 9 Aug 2018 17:12:06 -0700 Subject: [PATCH] The osfullname grain differs when using Python2 vs Python3, swapping this out for the "OS" grain which is consistent. --- tests/integration/modules/test_service.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/modules/test_service.py b/tests/integration/modules/test_service.py index d0282417d2..085d085b33 100644 --- a/tests/integration/modules/test_service.py +++ b/tests/integration/modules/test_service.py @@ -127,7 +127,7 @@ class ServiceModuleTest(ModuleCase): if tuple(self.run_function('grains.item', ['osrelease_info'])['osrelease_info']) == (14, 0o4) and not systemd: # currently upstart does not have a mechanism to report if disabling a service fails if does not exist self.assertTrue(self.run_function('service.disable', [srv_name])) - elif self.run_function('grains.item', ['osfullname'])['osfullname'] == 'Debian' and \ + elif self.run_function('grains.item', ['os'])['os'] == 'Debian' and \ self.run_function('grains.item', ['osmajorrelease'])['osmajorrelease'] < 9 and systemd: # currently disabling a service via systemd that does not exist # on Debian 8 results in a True return code