From a83fc07432dd476fd89e60125ec92c5bcbfbd060 Mon Sep 17 00:00:00 2001
From: Barney Sowood <barney@sowood.co.uk>
Date: Thu, 19 Jan 2023 11:57:20 +0000
Subject: [PATCH 01/18] Update python and salt versions in tox.ini

---
 tox.ini | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tox.ini b/tox.ini
index ece2b3c..67c74f6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,14 +1,14 @@
 [tox]
-envlist = py{27,34,35,36,37,38}-{cherrypy,tornado}-{v2018.3,v2019.2,develop},coverage,flake8
+envlist = py{35,36,37,38}-{cherrypy,tornado}-{v3004.2,v3005.1,master},coverage,flake8
 skip_missing_interpreters = true
 skipsdist = false
 
 [testenv]
-passenv = TOXENV CI TRAVIS TRAVIS_* CODECOV_*
+passenv = TOXENV, CI, TRAVIS, TRAVIS_*, CODECOV_*
 deps = -r{toxinidir}/tests/requirements.txt
-    v2018.3: salt<2018.4
-    v2019.2: salt<2019.3
-    develop: git+https://github.com/saltstack/salt.git@develop#egg=salt
+    v3004.2: salt<3004.2
+    v3005.1: salt<3005.1
+    master: git+https://github.com/saltstack/salt.git@master#egg=salt
 
 changedir = {toxinidir}
 setenv = COVERAGE_FILE = {toxworkdir}/.coverage.{envname}

From e7d7bd9b51209b7d4f4c02798f04ed5733b117fc Mon Sep 17 00:00:00 2001
From: Barney Sowood <barney@sowood.co.uk>
Date: Thu, 19 Jan 2023 12:05:00 +0000
Subject: [PATCH 02/18] Update coverage version to current

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 67c74f6..ad0d040 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,7 +25,7 @@ commands = flake8 tests/ pepper/ scripts/pepper setup.py
 [testenv:coverage]
 skip_install = True
 deps =
-    coverage >= 4.4.1, < 5
+    coverage >= 7.0.5, < 8
 setenv = COVERAGE_FILE={toxworkdir}/.coverage
 changedir = {toxinidir}
 commands =

From 29b0313df05b9d18f79826c1189d4261df8a419e Mon Sep 17 00:00:00 2001
From: Barney Sowood <barney@sowood.co.uk>
Date: Thu, 19 Jan 2023 13:12:01 +0000
Subject: [PATCH 03/18] Add GH Actions workflow

Adds Github Actions workflow to call tox and run tests.
Doesn't currently implement coverage functionality - will add that
later.
---
 .github/workflows/test.yaml | 44 +++++++++++++++++++++++++++++++++++++
 tox.ini                     |  2 +-
 2 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/test.yaml

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
new file mode 100644
index 0000000..24de2d6
--- /dev/null
+++ b/.github/workflows/test.yaml
@@ -0,0 +1,44 @@
+name: test
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: "0 8 * * *"
+
+jobs:
+  test:
+    name: test ${{ matrix.py }} - ${{ matrix.netapi }} - ${{ matrix.salt }}
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        py:
+          - "3.5"
+          - "3.6"
+          - "3.7"
+          - "3.8"
+        netapi:
+          - "cherrypy"
+          - "tornado"
+        salt:
+          - "v3004.2"
+          - "v3005.1"
+          - "master"
+    steps:
+      - name: Setup python for test ${{ matrix.py }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.py }}
+      - uses: actions/checkout@v3
+      - name: Install setuptools_scm
+        run: python -m pip install setuptools_scm
+      - name: Install tox
+        run: python -m pip install tox
+      - name: Install dependencies
+        run: sudo apt update && sudo apt install -y libc6-dev libffi-dev gcc git openssh-server libzmq3-dev
+        env:
+          DEBIAN_FRONTEND: noninteractive
+      - name: Setup tests
+        run: tox -vv --notest -e py${{ matrix.py }}-${{ matrix.netapi }}-${{ matrix.salt }}
+      - name: Run tests
+        run: tox -vv -e py${{ matrix.py }}-${{ matrix.netapi }}-${{ matrix.salt }}
diff --git a/tox.ini b/tox.ini
index ad0d040..d43f942 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{35,36,37,38}-{cherrypy,tornado}-{v3004.2,v3005.1,master},coverage,flake8
+envlist = py{3.5,3.6,3.7,3.8}-{cherrypy,tornado}-{v3004.2,v3005.1,master},coverage,flake8
 skip_missing_interpreters = true
 skipsdist = false
 

From b28888cc7a21c69c306bceee7e51cb58d019924a Mon Sep 17 00:00:00 2001
From: Barney Sowood <barney@sowood.co.uk>
Date: Thu, 19 Jan 2023 15:13:58 +0000
Subject: [PATCH 04/18] Add GH Actions workflow for flake8

---
 .github/workflows/flake8.yaml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 .github/workflows/flake8.yaml

diff --git a/.github/workflows/flake8.yaml b/.github/workflows/flake8.yaml
new file mode 100644
index 0000000..f7ce5f5
--- /dev/null
+++ b/.github/workflows/flake8.yaml
@@ -0,0 +1,23 @@
+name: flake8 lint
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: "0 8 * * *"
+
+jobs:
+  flake8-lint:
+    runs-on: ubuntu-20.04
+    name: flake8 lint
+    steps:
+      - name: Setup python for flake8
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.8"
+      - uses: actions/checkout@v3
+      - name: Install tox
+        run: python -m pip install tox
+      - name: Setup flake8
+        run: tox -vv --notest -e flake8
+      - name: Run flake8
+        run: tox -vv -e flake8

From d3c6c18df9cdd56445036fe0aa6eea9b7494ec2e Mon Sep 17 00:00:00 2001
From: Barney Sowood <barney@sowood.co.uk>
Date: Thu, 19 Jan 2023 15:27:47 +0000
Subject: [PATCH 05/18] Add exclusion for master and py3.5/3.6

Adds an exclusion for master and python 3.5/3.6 as 3006 onwards requires
py 3.7.
---
 .github/workflows/test.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 24de2d6..d33a0d9 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -24,6 +24,11 @@ jobs:
           - "v3004.2"
           - "v3005.1"
           - "master"
+        exclude:
+          - salt: master
+            py: "3.5"
+          - salt: master
+            py: "3.6"
     steps:
       - name: Setup python for test ${{ matrix.py }}
         uses: actions/setup-python@v4

From 6f897d95e944f5bba9a47b98cd2c52aacc9d3d00 Mon Sep 17 00:00:00 2001
From: Barney Sowood <barney@sowood.co.uk>
Date: Thu, 19 Jan 2023 15:43:45 +0000
Subject: [PATCH 06/18] Run tox without -vv

---
 .github/workflows/flake8.yaml | 4 ++--
 .github/workflows/test.yaml   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/flake8.yaml b/.github/workflows/flake8.yaml
index f7ce5f5..461a414 100644
--- a/.github/workflows/flake8.yaml
+++ b/.github/workflows/flake8.yaml
@@ -18,6 +18,6 @@ jobs:
       - name: Install tox
         run: python -m pip install tox
       - name: Setup flake8
-        run: tox -vv --notest -e flake8
+        run: tox --notest -e flake8
       - name: Run flake8
-        run: tox -vv -e flake8
+        run: tox -e flake8
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index d33a0d9..eea4aea 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -44,6 +44,6 @@ jobs:
         env:
           DEBIAN_FRONTEND: noninteractive
       - name: Setup tests
-        run: tox -vv --notest -e py${{ matrix.py }}-${{ matrix.netapi }}-${{ matrix.salt }}
+        run: tox --notest -e py${{ matrix.py }}-${{ matrix.netapi }}-${{ matrix.salt }}
       - name: Run tests
-        run: tox -vv -e py${{ matrix.py }}-${{ matrix.netapi }}-${{ matrix.salt }}
+        run: tox -e py${{ matrix.py }}-${{ matrix.netapi }}-${{ matrix.salt }}

From acce4f6c5bbf302f700d45a63c67bd4eb28b771e Mon Sep 17 00:00:00 2001
From: Barney Sowood <barney@sowood.co.uk>
Date: Thu, 19 Jan 2023 15:49:12 +0000
Subject: [PATCH 07/18] Update pytest-salt url

Updates pytest-salt url to point to
https://github.com/vmware-archive/pytest-salt. Should re-work tests
to use pytest-salt-factories.
---
 tests/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/requirements.txt b/tests/requirements.txt
index b0be5ff..65fa14d 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -2,7 +2,7 @@ mock
 pytest>=3.5.0,<4.0.0
 pytest-rerunfailures
 pytest-cov
-git+https://github.com/saltstack/pytest-salt@master#egg=pytest-salt
+git+https://github.com/vmware-archive/pytest-salt@master#egg=pytest-salt
 tornado<5.0.0
 CherryPy
 setuptools_scm

From 1c1aca7ef60cfdcfcac806ddf4a5ecfca28d6381 Mon Sep 17 00:00:00 2001
From: Barney Sowood <barney@sowood.co.uk>
Date: Thu, 19 Jan 2023 15:53:23 +0000
Subject: [PATCH 08/18] Update requirements to match current salt

Updates requirements to match current salt requirements for zeromq
and tornado.
---
 tests/requirements.txt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/requirements.txt b/tests/requirements.txt
index 65fa14d..f0f770d 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -3,8 +3,9 @@ pytest>=3.5.0,<4.0.0
 pytest-rerunfailures
 pytest-cov
 git+https://github.com/vmware-archive/pytest-salt@master#egg=pytest-salt
-tornado<5.0.0
+tornado==6.1
 CherryPy
 setuptools_scm
-pyzmq>=2.2.0,<17.1.0; python_version == '3.4'  # pyzmq 17.1.0 stopped building wheels for python3.4
-pyzmq>=2.2.0; python_version != '3.4'
+pyzmq<=20.0.0 ; python_version < "3.6"
+pyzmq>=17.0.0 ; python_version < "3.9"
+pyzmq>19.0.2 ; python_version >= "3.9"
\ No newline at end of file

From e4afa37895c7fcd7fb852c7c0b34a45cc428ad89 Mon Sep 17 00:00:00 2001
From: Barney Sowood <barney@sowood.co.uk>
Date: Fri, 20 Jan 2023 10:02:37 +0000
Subject: [PATCH 09/18] Removed scheduled run of flake8

---
 .github/workflows/flake8.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/flake8.yaml b/.github/workflows/flake8.yaml
index 461a414..b7b33ad 100644
--- a/.github/workflows/flake8.yaml
+++ b/.github/workflows/flake8.yaml
@@ -2,8 +2,6 @@ name: flake8 lint
 on:
   push:
   pull_request:
-  schedule:
-    - cron: "0 8 * * *"
 
 jobs:
   flake8-lint:

From ec53778ad0dbfa8173c922d334d98f7e0144a336 Mon Sep 17 00:00:00 2001
From: Barney Sowood <barney@sowood.co.uk>
Date: Thu, 16 Mar 2023 15:19:58 +0000
Subject: [PATCH 10/18] Drop testing of python 3.5 and 3.6

Drops testing of python 3.5 and 3.6 - moving to pytest-salt-factories
will remove support for those in it's 1.x releases.
---
 .github/workflows/test.yaml | 7 -------
 tox.ini                     | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index eea4aea..2da9d9e 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -13,8 +13,6 @@ jobs:
       fail-fast: false
       matrix:
         py:
-          - "3.5"
-          - "3.6"
           - "3.7"
           - "3.8"
         netapi:
@@ -24,11 +22,6 @@ jobs:
           - "v3004.2"
           - "v3005.1"
           - "master"
-        exclude:
-          - salt: master
-            py: "3.5"
-          - salt: master
-            py: "3.6"
     steps:
       - name: Setup python for test ${{ matrix.py }}
         uses: actions/setup-python@v4
diff --git a/tox.ini b/tox.ini
index d43f942..1db3e34 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{3.5,3.6,3.7,3.8}-{cherrypy,tornado}-{v3004.2,v3005.1,master},coverage,flake8
+envlist = py{3.7,3.8}-{cherrypy,tornado}-{v3004.2,v3005.1,master},coverage,flake8
 skip_missing_interpreters = true
 skipsdist = false
 

From e59dd58f47b1669dc365af8b7e35de8b21d06b24 Mon Sep 17 00:00:00 2001
From: Barney Sowood <barney@sowood.co.uk>
Date: Tue, 18 Apr 2023 16:25:33 +0100
Subject: [PATCH 11/18] Update testing requirements

Updates testing requirements.txt:
  * Use modern version of pytest
  * Use pytest-salt-factories rather than pytest-salt
---
 tests/requirements.txt | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/tests/requirements.txt b/tests/requirements.txt
index f0f770d..c3b1d7d 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1,11 +1,10 @@
 mock
-pytest>=3.5.0,<4.0.0
+pytest>=6.0.0
 pytest-rerunfailures
 pytest-cov
-git+https://github.com/vmware-archive/pytest-salt@master#egg=pytest-salt
-tornado==6.1
+pytest-salt-factories==0.912.2
 CherryPy
 setuptools_scm
 pyzmq<=20.0.0 ; python_version < "3.6"
 pyzmq>=17.0.0 ; python_version < "3.9"
-pyzmq>19.0.2 ; python_version >= "3.9"
\ No newline at end of file
+pyzmq>19.0.2 ; python_version >= "3.9"

From 53cc63f1e572ea61302fecd1c53c03a5b606fb4a Mon Sep 17 00:00:00 2001
From: Barney Sowood <barney@sowood.co.uk>
Date: Tue, 18 Apr 2023 16:30:23 +0100
Subject: [PATCH 12/18] Update tox.ini to use new pytest options

Updates tox.ini to use new pytest options for output.
---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 1db3e34..0da75a4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -49,7 +49,7 @@ changedir = {toxinidir}/htmlcov
 commands = python -m http.server
 
 [pytest]
-addopts = --showlocals --log-file /tmp/pepper-runtests.log --no-print-logs -ra
+addopts = --showlocals --log-file /tmp/pepper-runtests.log --show-capture=no -ra
 testpaths = tests
 norecursedirs = .git .tox
 usefixtures = pepperconfig

From 952bf25be3dc356e3a35ff1b698dd250051ac901 Mon Sep 17 00:00:00 2001
From: Barney Sowood <barney@sowood.co.uk>
Date: Tue, 18 Apr 2023 16:28:55 +0100
Subject: [PATCH 13/18] Update fixtures to use pytest-salt-factories

Updates test fixture to use pytest-salt-factories rather than the now
archived pytest-salt.
---
 tests/conftest.py | 259 +++++++++++++++++-----------------------------
 1 file changed, 97 insertions(+), 162 deletions(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index 81d2662..8de74d1 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -2,7 +2,6 @@
 from __future__ import absolute_import, unicode_literals, print_function
 
 # Import python libraries
-import distutils.spawn
 import logging
 import os.path
 import shutil
@@ -11,48 +10,86 @@
 import textwrap
 
 # Import Salt Libraries
-import salt.client
-import salt.config
 import salt.utils.yaml as yaml
 
 # Import pytest libraries
 import pytest
-from pytestsalt.utils import SaltDaemonScriptBase, start_daemon, get_unused_localhost_port
+from pytestskipmarkers.utils import ports
+from saltfactories.utils import random_string, running_username
 
 # Import Pepper libraries
 import pepper
 import pepper.script
 
-DEFAULT_MASTER_ID = 'pytest-salt-master'
-DEFAULT_MINION_ID = 'pytest-salt-minion'
 
 log = logging.getLogger(__name__)
 
 
 @pytest.fixture(scope='session')
-def install_sshd_server():
-    if distutils.spawn.find_executable('sshd'):
-        return
-    __opts__ = salt.config.minion_config('tests/minion.conf')
-    __opts__['file_client'] = 'local'
-    caller = salt.client.Caller(mopts=__opts__)
-    caller.cmd('pkg.install', 'openssh-server')
+def sshd_config_dir(salt_factories):
+    config_dir = salt_factories.get_root_dir_for_daemon("sshd")
+    yield config_dir
+    shutil.rmtree(str(config_dir), ignore_errors=True)
 
 
-class SaltApi(SaltDaemonScriptBase):
-    '''
-    Class which runs the salt-api daemon
-    '''
-
-    def get_script_args(self):
-        return ['-l', 'quiet']
+@pytest.fixture(scope='session')
+def session_sshd_server(salt_factories, sshd_config_dir, session_master):
+    sshd_config_dict = {
+        "Protocol": "2",
+        # Turn strict modes off so that we can operate in /tmp
+        "StrictModes": "no",
+        # Logging
+        "SyslogFacility": "AUTH",
+        "LogLevel": "INFO",
+        # Authentication:
+        "LoginGraceTime": "120",
+        "PermitRootLogin": "without-password",
+        "PubkeyAuthentication": "yes",
+        # Don't read the user's ~/.rhosts and ~/.shosts files
+        "IgnoreRhosts": "yes",
+        "HostbasedAuthentication": "no",
+        # To enable empty passwords, change to yes (NOT RECOMMENDED)
+        "PermitEmptyPasswords": "no",
+        # Change to yes to enable challenge-response passwords (beware issues with
+        # some PAM modules and threads)
+        "ChallengeResponseAuthentication": "no",
+        # Change to no to disable tunnelled clear text passwords
+        "PasswordAuthentication": "no",
+        "X11Forwarding": "no",
+        "X11DisplayOffset": "10",
+        "PrintMotd": "no",
+        "PrintLastLog": "yes",
+        "TCPKeepAlive": "yes",
+        "AcceptEnv": "LANG LC_*",
+        "UsePAM": "yes",
+    }
+    factory = salt_factories.get_sshd_daemon(
+        sshd_config_dict=sshd_config_dict,
+        config_dir=sshd_config_dir,
+    )
+    with factory.started():
+        yield factory
 
-    def get_check_ports(self):
-        if 'rest_cherrypy' in self.config:
-            return [self.config['rest_cherrypy']['port']]
 
-        if 'rest_tornado' in self.config:
-            return [self.config['rest_tornado']['port']]
+@pytest.fixture(scope='session')
+def session_ssh_roster_config(session_sshd_server, session_master):
+    roster_contents = """
+    localhost:
+      host: 127.0.0.1
+      port: {}
+      user: {}
+      priv: {}
+      mine_functions:
+        test.arg: ['itworked']
+    """.format(
+        session_sshd_server.listen_port,
+        running_username(),
+        session_sshd_server.client_key
+    )
+    with pytest.helpers.temp_file(
+        "roster", roster_contents, session_master.config_dir
+    ) as roster_file:
+        yield roster_file
 
 
 @pytest.fixture(scope='session')
@@ -60,7 +97,7 @@ def salt_api_port():
     '''
     Returns an unused localhost port for the api port
     '''
-    return get_unused_localhost_port()
+    return ports.get_unused_localhost_port()
 
 
 @pytest.fixture(scope='session')
@@ -121,7 +158,7 @@ def output_file():
 
 
 @pytest.fixture(params=['/run', '/login'])
-def pepper_cli(request, session_salt_api, salt_api_port, output_file, install_sshd_server, session_sshd_server):
+def pepper_cli(request, session_salt_api, salt_api_port, output_file, session_sshd_server):
     '''
     Wrapper to invoke Pepper with common params and inside an empty env
     '''
@@ -154,6 +191,20 @@ def _run_pepper_cli(*args, **kwargs):
     return _run_pepper_cli
 
 
+@pytest.fixture(scope='session')
+def session_master_factory(request, salt_factories, session_master_config_overrides):
+    return salt_factories.salt_master_daemon(
+        random_string("master-"),
+        overrides=session_master_config_overrides
+    )
+
+
+@pytest.fixture(scope='session')
+def session_master(session_master_factory):
+    with session_master_factory.started():
+        yield session_master_factory
+
+
 @pytest.fixture(scope='session')
 def session_master_config_overrides(request, salt_api_port, salt_api_backend):
     return {
@@ -179,65 +230,25 @@ def session_master_config_overrides(request, salt_api_port, salt_api_backend):
 
 
 @pytest.fixture(scope='session')
-def session_api_log_prefix(master_id):
-    return 'salt-api/{0}'.format(master_id)
+def session_minion_factory(session_master_factory):
+    """Return a factory for a randomly named minion connected to master."""
+    minion_factory = session_master_factory.salt_minion_daemon(random_string("minion-"))
+    minion_factory.after_terminate(
+        pytest.helpers.remove_stale_minion_key, session_master_factory, minion_factory.id
+    )
+    return minion_factory
 
 
 @pytest.fixture(scope='session')
-def cli_api_script_name():
-    '''
-    Return the CLI script basename
-    '''
-    return 'salt-api'
-
-
-@pytest.yield_fixture(scope='session')
-def session_salt_api_before_start():
-    '''
-    This fixture should be overridden if you need to do
-    some preparation and clean up work before starting
-    the salt-api and after ending it.
-    '''
-    # Prep routines go here
-
-    # Start the salt-api
-    yield
-
-    # Clean routines go here
-
-
-@pytest.yield_fixture(scope='session')
-def session_salt_api_after_start(session_salt_api):
-    '''
-    This fixture should be overridden if you need to do
-    some preparation and clean up work after starting
-    the salt-api and before ending it.
-    '''
-    # Prep routines go here
-
-    # Resume test execution
-    yield
-
-    # Clean routines go here
+def session_minion(session_master, session_minion_factory):  # noqa
+    assert session_master.is_running()
+    with session_minion_factory.started():
+        yield session_minion_factory
 
 
 @pytest.fixture(scope='session')
-def _salt_fail_hard(request, salt_fail_hard):
-    '''
-    Return the salt fail hard value
-    '''
-    fail_hard = request.config.getoption('salt_fail_hard')
-    if fail_hard is not None:
-        # We were passed --salt-fail-hard as a CLI option
-        return fail_hard
-
-    # The salt fail hard was not passed as a CLI option
-    fail_hard = request.config.getini('salt_fail_hard')
-    if fail_hard != []:
-        # We were passed salt_fail_hard as a INI option
-        return fail_hard
-
-    return salt_fail_hard
+def session_minion_id(session_minion):
+    return session_minion.id
 
 
 @pytest.fixture(scope='session')
@@ -257,91 +268,15 @@ def salt_api_backend(request):
 
 
 @pytest.fixture(scope='session')
-def master_id(salt_master_id_counter):
-    '''
-    Returns the master id
-    '''
-    return DEFAULT_MASTER_ID + '-{0}'.format(salt_master_id_counter())
+def session_salt_api_factory(session_master_factory):
+    return session_master_factory.salt_api_daemon()
 
 
 @pytest.fixture(scope='session')
-def minion_id(salt_minion_id_counter):
-    '''
-    Returns the minion id
-    '''
-    return DEFAULT_MINION_ID + '-{0}'.format(salt_minion_id_counter())
-
-
-@pytest.fixture(scope='session')
-def session_salt_api(request,
-                     session_salt_minion,
-                     session_master_id,
-                     session_master_config,
-                     session_salt_api_before_start,  # pylint: disable=unused-argument
-                     session_api_log_prefix,
-                     cli_api_script_name,
-                     log_server,
-                     _cli_bin_dir,
-                     session_conf_dir):
-    '''
-    Returns a running salt-api
-    '''
-    return start_daemon(request,
-                        daemon_name='salt-api',
-                        daemon_id=session_master_id,
-                        daemon_log_prefix=session_api_log_prefix,
-                        daemon_cli_script_name=cli_api_script_name,
-                        daemon_config=session_master_config,
-                        daemon_config_dir=session_conf_dir,
-                        daemon_class=SaltApi,
-                        bin_dir_path=_cli_bin_dir,
-                        start_timeout=30)
-
-
-@pytest.fixture(scope='session')
-def session_sshd_config_lines(session_sshd_port):
-    '''
-    Return a list of lines which will make the sshd_config file
-    '''
-    return [
-        'Port {0}'.format(session_sshd_port),
-        'ListenAddress 127.0.0.1',
-        'Protocol 2',
-        'UsePrivilegeSeparation yes',
-        '# Turn strict modes off so that we can operate in /tmp',
-        'StrictModes no',
-        '# Logging',
-        'SyslogFacility AUTH',
-        'LogLevel INFO',
-        '# Authentication:',
-        'LoginGraceTime 120',
-        'PermitRootLogin without-password',
-        'StrictModes yes',
-        'PubkeyAuthentication yes',
-        '#AuthorizedKeysFile	%h/.ssh/authorized_keys',
-        '#AuthorizedKeysFile	key_test.pub',
-        '# Don\'t read the user\'s ~/.rhosts and ~/.shosts files',
-        'IgnoreRhosts yes',
-        '# similar for protocol version 2',
-        'HostbasedAuthentication no',
-        '#IgnoreUserKnownHosts yes',
-        '# To enable empty passwords, change to yes (NOT RECOMMENDED)',
-        'PermitEmptyPasswords no',
-        '# Change to yes to enable challenge-response passwords (beware issues with',
-        '# some PAM modules and threads)',
-        'ChallengeResponseAuthentication no',
-        '# Change to no to disable tunnelled clear text passwords',
-        'PasswordAuthentication no',
-        'X11Forwarding no',
-        'X11DisplayOffset 10',
-        'PrintMotd no',
-        'PrintLastLog yes',
-        'TCPKeepAlive yes',
-        '#UseLogin no',
-        'AcceptEnv LANG LC_*',
-        'Subsystem sftp /usr/lib/openssh/sftp-server',
-        '#UsePAM yes',
-    ]
+def session_salt_api(session_master, session_salt_api_factory):
+    assert session_master.is_running()
+    with session_salt_api_factory.started():
+        yield session_salt_api_factory
 
 
 def pytest_addoption(parser):

From 96484be110acfe146b09b10c0fea4b906170aaa1 Mon Sep 17 00:00:00 2001
From: Barney Sowood <barney@sowood.co.uk>
Date: Tue, 18 Apr 2023 15:45:38 +0100
Subject: [PATCH 14/18] Update client integration tests

Updates client integration tests to work with pytest-salt-factories.
Also update xfails to handle newer pytest.
---
 tests/integration/test_clients.py | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/tests/integration/test_clients.py b/tests/integration/test_clients.py
index 6012c8e..2932df6 100644
--- a/tests/integration/test_clients.py
+++ b/tests/integration/test_clients.py
@@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
 import json
-import os
+import pathlib
 import pytest
-import sys
 
 
 def test_local_bad_opts(pepper_cli):
@@ -17,7 +16,7 @@ def test_local_bad_opts(pepper_cli):
 
 
 @pytest.mark.xfail(
-    pytest.config.getoption("--salt-api-backend") == "rest_tornado",
+    'config.getoption("--salt-api-backend") == "rest_tornado"',
     reason="timeout kwarg isnt popped until next version of salt/tornado"
 )
 def test_runner_client(pepper_cli):
@@ -30,34 +29,35 @@ def test_runner_client(pepper_cli):
 
 
 @pytest.mark.xfail(
-    pytest.config.getoption("--salt-api-backend") == "rest_tornado",
+    'config.getoption("--salt-api-backend") == "rest_tornado"',
     reason="wheelClient unimplemented for now on tornado",
 )
-def test_wheel_client_arg(pepper_cli, session_minion_id):
+def test_wheel_client_arg(pepper_cli, session_minion):
     ret = pepper_cli('--client=wheel', 'minions.connected')
-    assert ret == ['pytest-session-salt-minion-0']
+    assert ret == [session_minion.id]
 
 
 @pytest.mark.xfail(
-    pytest.config.getoption("--salt-api-backend") == "rest_tornado",
+    'config.getoption("--salt-api-backend") == "rest_tornado"',
     reason="wheelClient unimplemented for now on tornado",
 )
-def test_wheel_client_kwargs(pepper_cli, session_master_config_file):
+def test_wheel_client_kwargs(pepper_cli, session_master):
     ret = pepper_cli(
         '--client=wheel', 'config.update_config', 'file_name=pepper',
         'yaml_contents={0}'.format(json.dumps({"timeout": 5})),
     )
     assert ret == 'Wrote pepper.conf'
-    assert os.path.isfile('{0}.d/pepper.conf'.format(session_master_config_file))
+
+    default_include_dir = pathlib.Path(session_master.config['default_include']).parent
+    pepper_config = (pathlib.Path(session_master.config_dir) / default_include_dir / 'pepper.conf')
+    assert pepper_config.exists
 
 
 @pytest.mark.xfail(
-    pytest.config.getoption("--salt-api-backend") == "rest_tornado",
+    'config.getoption("--salt-api-backend") == "rest_tornado"',
     reason="sshClient unimplemented for now on tornado",
 )
-@pytest.mark.xfail(sys.version_info >= (3, 0),
-                   reason='Broken with python3 right now')
-def test_ssh_client(pepper_cli, session_roster_config, session_roster_config_file):
+def test_ssh_client(pepper_cli, session_ssh_roster_config):
     ret = pepper_cli('--client=ssh', '*', 'test.ping')
     assert ret['ssh']['localhost']['return'] is True
 

From 1bbe77a0cbf40b15a0dd7cb2d6a44562f83a14b9 Mon Sep 17 00:00:00 2001
From: Barney Sowood <barney@sowood.co.uk>
Date: Tue, 18 Apr 2023 16:12:29 +0100
Subject: [PATCH 15/18] Update vanilla integration tests for new pytest

---
 tests/integration/test_vanilla.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/integration/test_vanilla.py b/tests/integration/test_vanilla.py
index 04d0647..2864b5a 100644
--- a/tests/integration/test_vanilla.py
+++ b/tests/integration/test_vanilla.py
@@ -9,7 +9,7 @@ def test_local(pepper_cli, session_minion_id):
 
 
 @pytest.mark.xfail(
-    pytest.config.getoption("--salt-api-backend") == "rest_tornado",
+    'config.getoption("--salt-api-backend") == "rest_tornado"',
     reason="this is broken in rest_tornado until future release",
 )
 def test_long_local(pepper_cli, session_minion_id):

From d51f7250e9b937be7af792895684cc8d43bb6d2d Mon Sep 17 00:00:00 2001
From: Barney Sowood <barney@sowood.co.uk>
Date: Tue, 18 Apr 2023 16:51:46 +0100
Subject: [PATCH 16/18] Fix jinja 3.1 issue

---
 tox.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tox.ini b/tox.ini
index 0da75a4..3ce7474 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,6 +7,7 @@ skipsdist = false
 passenv = TOXENV, CI, TRAVIS, TRAVIS_*, CODECOV_*
 deps = -r{toxinidir}/tests/requirements.txt
     v3004.2: salt<3004.2
+    v3004.2: jinja2<3.1
     v3005.1: salt<3005.1
     master: git+https://github.com/saltstack/salt.git@master#egg=salt
 

From 7588e211ee502c4498da361ba06d6baf74689ed0 Mon Sep 17 00:00:00 2001
From: Barney Sowood <barney@sowood.co.uk>
Date: Tue, 18 Apr 2023 17:26:38 +0100
Subject: [PATCH 17/18] Enable all netapi clients

---
 tests/conftest.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/tests/conftest.py b/tests/conftest.py
index 8de74d1..5cf86aa 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -226,6 +226,17 @@ def session_master_config_overrides(request, salt_api_port, salt_api_backend):
         'token_expire': 94670856,
         'ignore_host_keys': True,
         'ssh_wipe': True,
+        'netapi_enable_clients': [
+            'local',
+            'local_async',
+            'local_subset',
+            'ssh',
+            'runner',
+            'runner_async',
+            'wheel',
+            'wheel_async',
+            'run'
+        ]
     }
 
 

From 369b5a1fd68ca827bcbb7a27edfbe647e534723f Mon Sep 17 00:00:00 2001
From: Barney Sowood <barney@sowood.co.uk>
Date: Tue, 18 Apr 2023 18:33:08 +0100
Subject: [PATCH 18/18] Use importlib-metadata<5.0.0 on older python/salt

Uses importlib-metadata<5.0.0 for python3.7 on 3004.2 and 3005.1 to
work around a bug in salt.utils.entrypoints when using
pytest-salt-factories.
---
 tox.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tox.ini b/tox.ini
index 3ce7474..4415136 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,6 +9,7 @@ deps = -r{toxinidir}/tests/requirements.txt
     v3004.2: salt<3004.2
     v3004.2: jinja2<3.1
     v3005.1: salt<3005.1
+    py3.7-{cherrypy,tornado}-{v3004.2,v3005.1}: importlib-metadata<5.0.0
     master: git+https://github.com/saltstack/salt.git@master#egg=salt
 
 changedir = {toxinidir}