This test module does not target linux service alone

tests/filename_map.yml

@@ -24,6 +24,7 @@ salt/modules/(aix_group|groupadd|mac_group|pw_group|solaris_group|win_groupadd)\
 
 salt/modules/(debian_service|freebsdservice|gentoo_service|launchctl_service|mac_service|netbsdservice|openbsdrcctl_service|openbsdservice|rh_service|runit|linux_service|smf_service|systemd_service|upstart_service|win_service)\.py:
   - unit.states.test_service
+  - integration.modules.test_service
   - integration.states.test_service
 
 salt/modules/*apache.py:

tests/integration/modules/test_service.py

@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-
-from __future__ import absolute_import, print_function, unicode_literals
-
 import pytest
 import salt.utils.path
 import salt.utils.platform
@@ -53,7 +49,7 @@ class ServiceModuleTest(ModuleCase):
             salt.utils.path.which(cmd_name) is None
             and not salt.utils.platform.is_windows()
         ):
-            self.skipTest("{0} is not installed".format(cmd_name))
+            self.skipTest("{} is not installed".format(cmd_name))
 
     def tearDown(self):
         post_srv_status = self.run_function("service.status", [self.service_name])

tests/unit/test_module_names.py

@@ -1,11 +1,9 @@
-# -*- coding: utf-8 -*-
 """
     tests.unit.test_test_module_name
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 """
 
 # Import Python libs
-from __future__ import absolute_import
 
 import fnmatch
 import os
@@ -144,6 +142,7 @@ class BadTestModuleNamesTestCase(TestCase):
             "integration.minion.test_timeout",
             "integration.modules.test_decorators",
             "integration.modules.test_pkg",
+            "integration.modules.test_service",
             "integration.modules.test_state_jinja_filters",
             "integration.modules.test_sysctl",
             "integration.netapi.rest_cherrypy.test_app_pam",
@@ -221,7 +220,7 @@ class BadTestModuleNamesTestCase(TestCase):
 
         def _format_errors(errors):
             msg = (
-                "The following {0} test module(s) could not be matched to a "
+                "The following {} test module(s) could not be matched to a "
                 "source code file:\n\n".format(len(errors))
             )
             msg += "".join(errors)
@@ -258,6 +257,6 @@ class BadTestModuleNamesTestCase(TestCase):
                     # Yep, it is. Carry on!
                     continue
 
-                errors.append("{0} (expected: {1})\n".format(mod_name, relpath))
+                errors.append("{} (expected: {})\n".format(mod_name, relpath))
 
         assert not errors, _format_errors(errors)

tests/whitelist.txt

@@ -33,7 +33,6 @@ integration.modules.test_groupadd
 integration.modules.test_hosts
 integration.modules.test_key
 integration.modules.test_linux_acl
-integration.modules.test_linux_service
 integration.modules.test_linux_shadow
 integration.modules.test_localemod
 integration.modules.test_lxc
@@ -48,6 +47,7 @@ integration.modules.test_publish
 integration.modules.test_pw_user
 integration.modules.test_rabbitmq
 integration.modules.test_saltutil
+integration.modules.test_service
 integration.modules.test_ssh
 integration.modules.test_state
 integration.modules.test_status