Fix use of salt_systemd_setup fixture

Fixes use of salt_systemd_setup fixture - we need to call it for each
test function otherwise state will persist across tests. Made it a
function scoped fixture and removed the attempts to call it in the
functions, which wouldn't work.

Author: barneysowood

tests/pytests/pkg/upgrade/test_systemd_permissions.py

@@ -7,7 +7,7 @@
 ]
 
 
-@pytest.fixture
+@pytest.fixture(scope="function")
 def salt_systemd_setup(
     salt_call_cli,
     install_salt,
@@ -39,10 +39,6 @@ def test_salt_systemd_disabled_preservation(
     if not install_salt.upgrade:
         pytest.skip("Not testing an upgrade, do not run")
 
-    # setup systemd to enabled and active for Salt packages
-    # pylint: disable=pointless-statement
-    salt_systemd_setup
-
     # ensure known state, disabled
     test_list = ["salt-api", "salt-minion", "salt-master"]
     for test_item in test_list:
@@ -74,10 +70,6 @@ def test_salt_systemd_enabled_preservation(
     if not install_salt.upgrade:
         pytest.skip("Not testing an upgrade, do not run")
 
-    # setup systemd to enabled and active for Salt packages
-    # pylint: disable=pointless-statement
-    salt_systemd_setup
-
     # Upgrade Salt (inc. minion, master, etc.) from previous version and test
     # pylint: disable=pointless-statement
     install_salt.install(upgrade=True)
@@ -102,10 +94,6 @@ def test_salt_systemd_inactive_preservation(
     if not install_salt.upgrade:
         pytest.skip("Not testing an upgrade, do not run")
 
-    # setup systemd to enabled and active for Salt packages
-    # pylint: disable=pointless-statement
-    salt_systemd_setup
-
     # ensure known state, disabled
     test_list = ["salt-api", "salt-minion", "salt-master"]
     for test_item in test_list:
@@ -137,10 +125,6 @@ def test_salt_systemd_active_preservation(
     if not install_salt.upgrade:
         pytest.skip("Not testing an upgrade, do not run")
 
-    # setup systemd to enabled and active for Salt packages
-    # pylint: disable=pointless-statement
-    salt_systemd_setup
-
     # Upgrade Salt (inc. minion, master, etc.) from previous version and test
     # pylint: disable=pointless-statement
     install_salt.install(upgrade=True)
@@ -163,10 +147,6 @@ def test_salt_ownership_permission(salt_call_cli, install_salt, salt_systemd_set
     if not install_salt.upgrade:
         pytest.skip("Not testing an upgrade, do not run")
 
-    # setup systemd to enabled and active for Salt packages
-    # pylint: disable=pointless-statement
-    salt_systemd_setup
-
     # test ownership for Minion, Master and Api
     test_list = ["salt-api", "salt-minion", "salt-master"]
     for test_item in test_list: