gentoo resync : 06.04.2022

5 files changed, 447 insertions, 139 deletions

diff --git a/dev-python/pytest-salt-factories/Manifest b/dev-python/pytest-salt-factories/Manifest
index e07c8abef946..c0672c531684 100644
--- a/dev-python/pytest-salt-factories/Manifest
+++ b/dev-python/pytest-salt-factories/Manifest
@@ -1,4 +1,7 @@
-AUX pytest-salt-factories-0.911.0-tests.patch 18802 BLAKE2B 96ffe39243ca88c9fe14c3eed3ddea6727a609b7b869ee480c6d005fc9d0c57894757fcd9767507f90fccf2bc3b95ed72f99cf93b2e7c8970cad7e0be46902b0 SHA512 d57a0730c1a7d66fab577a6e0c477f3acd42005066f101ef96ff705546f6f43cdc3a1083fd0d1040c033d880c324b2c8146982747e965da997308002255e5063
-DIST pytest-salt-factories-0.911.0.tar.gz 161682 BLAKE2B b5a827c9a9acc55c53bc4152b648f96845f513e2d1c8425cbde0862909996a653df4debbf798a3d7461da4fc221acd5fc8e6052e123f3e64e0c8f4345557f141 SHA512 bada21cfe990ccb10b0e298cb05a7f3842d0fe24e2c8664352ae991363d0094dd1ff877adea5fcc0c1040e3f20f82ba616607c595511cade93ebadddd336a26b
-EBUILD pytest-salt-factories-0.911.0.ebuild 1889 BLAKE2B 021387b93fd3e24614a6b9d462de471b0b88ae9d92f6d1e1141477133c0bccd83a2567823adf540bb1a29b2725dcbb582d85d115246ec28d3c2e4ea7615199e1 SHA512 d2e18edd8015c4c554559d48f8a6cee6e86e2103eaeea68c354ce4473abd64091fac471cad51ab5e5fee3141af945d48d39074fe96156e6d1f2aeaec3e7b9c24
+AUX pytest-salt-factories-0.121.1-tests.patch 12284 BLAKE2B 4374c59c530d5e0171763b376ecf883354ada4255943017ac60361309dc5799ef563233474a5fa1756e7193285e46d7186973c8413b558dfcb3408cd42aecb6f SHA512 08ef49871ca4882dcd57a51c99e40fb87267ff07c666c54ba475061fb113f5e985c0c23f586366c33cb00b07bc190b98e6d7bb080004ee8b7c171bdb016f9ef8
+AUX pytest-salt-factories-1.0.0_rc13-tests.patch 16967 BLAKE2B 804b5e2ce678e732f8e01b3f652bb9f6a82caed3886e552dd359e27da40e5bb7fbff336828f944b2e0455399d78b7bc2defce37b641b1737e155beff5a4e72bd SHA512 bc6abcd079afc560815c00c900e350b468b572d67417f18d3a4f559bc5fb02b7e703a17afda7011c9682f55c09eb19b09250ac06c5135478235e03233c588fe1
+DIST pytest-salt-factories-0.121.1.tar.gz 102121 BLAKE2B 92cd5953b11377f1646f01b86a677a50216d16bcb944235a3f04176aecbb005974c415adcbf23cc391aab41b1ee9596984516ab61ecdd8c944d4ce707c39ab00 SHA512 32252695c6e8b17ef17d3330c4b0b38bdce89201d5573b4efa3531a72e826ee1fb26fea3ad0408401dec867cee405f21031804c32eb8fe6ceaa00925b17725a1
+DIST pytest-salt-factories-1.0.0_rc13.tar.gz 148418 BLAKE2B 3688f05d137df23266ebc7e999bc3b3a8ec198173b38dc98bd4a1e2655b982a37485278691e970da0be700cee6f609c57933b041a6d8403e75fb197f5d23d5d4 SHA512 f3713410704540ee48b7263973d3a9bf3159fb63e53e5ef5002201aea3fdcf0b4eaf00e1dd1e67d869b42242985d8117a117568d63abf5ad366e247fb3e1d83f
+EBUILD pytest-salt-factories-0.121.1-r1.ebuild 1724 BLAKE2B 83786447369717e7f414a154abf586dd1c87581f5809ba313ed954767f65ffb176b31c2e7d50523524619a703b601f8643c0134e0b564a2bbfa97d99a51ecc82 SHA512 889d5bfba0d62b48a9fef8327f11f31f7683d6d9107e9b9b537fa51eea66b7aa37f598da10f1836f68c95ad86eedda0ed5c0649aefde063cfa38b8402776fd23
+EBUILD pytest-salt-factories-1.0.0_rc13.ebuild 1994 BLAKE2B 17d059be013ddad9f20f5a49398c814aa566181ce3df09fe9da126f606b72954ea83db171b767aa204f045cd044274fd2630a558711dffef80fa22bf3c021ff0 SHA512 c186cb7816d1efc96ec6b90e55f074b65910e116c7592fdc959f1423d76b260c949667ef0346acf81976c0f77fc6fc907e1211ff96081c9dcd99cfadd13cb2e1
 MISC metadata.xml 358 BLAKE2B 0ca310e1a7269e532dfe3610bf5c9a1d93ff8dcc46ee3f26322cfb0ba1fb572b521359547f49b0deb3f463efd0321e3b3bee0403878df676e3c54dbcac14753a SHA512 8eaf37e98efe76ff401c536368d1537255d09db93b4f84254b7eb291b603f6ee83d80a65e9529c7bcea8324baaff708dc12f97662dd87c57fece36a1d5d8e1c9
diff --git a/dev-python/pytest-salt-factories/files/pytest-salt-factories-0.121.1-tests.patch b/dev-python/pytest-salt-factories/files/pytest-salt-factories-0.121.1-tests.patch
new file mode 100644
index 000000000000..3e85580c9158
--- /dev/null
+++ b/dev-python/pytest-salt-factories/files/pytest-salt-factories-0.121.1-tests.patch
@@ -0,0 +1,294 @@
+diff --git a/saltfactories/plugin.py b/saltfactories/plugin.py
+index b29a115..9d68c34 100644
+--- a/saltfactories/plugin.py
++++ b/saltfactories/plugin.py
+@@ -21,7 +21,7 @@ def pytest_tempdir_temproot():
+         tempdir = os.environ.get("TMPDIR") or tempfile.gettempdir()
+     else:
+         tempdir = "/tmp"
+-    return os.path.abspath(os.path.realpath(tempdir))
++    return os.path.abspath(tempdir)
+ 
+ 
+ def pytest_tempdir_basename():
+diff --git a/tests/functional/markers/test_requires_network.py b/tests/functional/markers/test_requires_network.py
+index 8b57368..d58f0a1 100644
+--- a/tests/functional/markers/test_requires_network.py
++++ b/tests/functional/markers/test_requires_network.py
+@@ -9,7 +9,10 @@ from unittest import mock
+ from saltfactories.utils import ports
+ from saltfactories.utils import socket
+ 
++import pytest
+ 
++
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_has_local_network(testdir):
+     testdir.makepyfile(
+         """
+diff --git a/tests/integration/factories/cli/test_salt.py b/tests/integration/factories/cli/test_salt.py
+index 17fce6c..7bd2789 100644
+--- a/tests/integration/factories/cli/test_salt.py
++++ b/tests/integration/factories/cli/test_salt.py
+@@ -17,6 +17,7 @@ def salt_minion_2(salt_master, salt_minion):
+         yield factory
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_merged_json_out(salt_cli, salt_minion, salt_minion_2):
+     ret = salt_cli.run("test.ping", minion_tgt="*")
+     assert ret.exitcode == 0, ret
+@@ -27,6 +28,7 @@ def test_merged_json_out(salt_cli, salt_minion, salt_minion_2):
+     assert ret.json[salt_minion_2.id] is True
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_merged_json_out_disabled(salt_cli, salt_minion, salt_minion_2):
+     ret = salt_cli.run("test.ping", minion_tgt="*", merge_json_output=False)
+     assert ret.exitcode == 0, ret
+diff --git a/tests/integration/factories/daemons/api/test_api.py b/tests/integration/factories/daemons/api/test_api.py
+index 78b8bb7..e20f28c 100644
+--- a/tests/integration/factories/daemons/api/test_api.py
++++ b/tests/integration/factories/daemons/api/test_api.py
+@@ -23,5 +23,6 @@ def salt_api(master):
+         yield factory
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_api(salt_api):
+     assert salt_api.is_running()
+diff --git a/tests/integration/factories/daemons/api/test_restarts.py b/tests/integration/factories/daemons/api/test_restarts.py
+index a6c5472..dd15c17 100644
+--- a/tests/integration/factories/daemons/api/test_restarts.py
++++ b/tests/integration/factories/daemons/api/test_restarts.py
+@@ -16,6 +16,7 @@ def master(salt_factories):
+         yield factory
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_multiple_start_stops(master):
+     factory = master.get_salt_api_daemon()
+     assert factory.is_running() is False
+diff --git a/tests/integration/factories/daemons/master/test_master.py b/tests/integration/factories/daemons/master/test_master.py
+index 2676dfa..cbf598e 100644
+--- a/tests/integration/factories/daemons/master/test_master.py
++++ b/tests/integration/factories/daemons/master/test_master.py
+@@ -46,10 +46,12 @@ def salt_key(master):
+     return master.get_salt_key_cli()
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_master(master):
+     assert master.is_running()
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_salt_run(master, salt_run):
+     max_open_files_config_value = master.config["max_open_files"]
+     ret = salt_run.run("config.get", "max_open_files")
+@@ -57,6 +59,7 @@ def test_salt_run(master, salt_run):
+     assert ret.json == max_open_files_config_value
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_salt_cp(master, minion, salt_cp, tempfiles):
+     """
+     Test copying a file from the master to the minion
+@@ -98,6 +101,7 @@ def test_salt_cp(master, minion, salt_cp, tempfiles):
+             os.unlink(dest)
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_salt_cp_no_match(master, minion, salt_cp, tempfiles):
+     assert master.is_running()
+     assert minion.is_running()
+@@ -119,6 +123,7 @@ def test_salt_cp_no_match(master, minion, salt_cp, tempfiles):
+             os.unlink(dest)
+ 
+ 
++@pytest.mark.skip("not compatible with sandbox")
+ @pytest.mark.skip_on_salt_system_install
+ def test_salt_key(master, minion, minion_3, salt_key):
+     ret = salt_key.run("--list-all")
+diff --git a/tests/integration/factories/daemons/master/test_restarts.py b/tests/integration/factories/daemons/master/test_restarts.py
+index 6a6852d..70415d0 100644
+--- a/tests/integration/factories/daemons/master/test_restarts.py
++++ b/tests/integration/factories/daemons/master/test_restarts.py
+@@ -11,6 +11,7 @@ def master(salt_factories):
+     return factory
+ 
+ 
++@pytest.mark.skip("not compatible with network")
+ def test_multiple_start_stops(master):
+     assert master.is_running() is False
+     pid = None
+diff --git a/tests/integration/factories/daemons/minion/test_event_forwarder_engine.py b/tests/integration/factories/daemons/minion/test_event_forwarder_engine.py
+index d63e640..653693e 100644
+--- a/tests/integration/factories/daemons/minion/test_event_forwarder_engine.py
++++ b/tests/integration/factories/daemons/minion/test_event_forwarder_engine.py
+@@ -28,6 +28,7 @@ def salt_call_cli(minion):
+     return minion.get_salt_call_cli()
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_event_listener_engine(minion, salt_call_cli, event_listener):
+     """
+     There are some events which the minion fires internally that never reach the master.
+diff --git a/tests/integration/factories/daemons/minion/test_minion.py b/tests/integration/factories/daemons/minion/test_minion.py
+index 64a3df6..ab82e55 100644
+--- a/tests/integration/factories/daemons/minion/test_minion.py
++++ b/tests/integration/factories/daemons/minion/test_minion.py
+@@ -27,6 +27,7 @@ def salt_call_cli(minion):
+     return minion.get_salt_call_cli()
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_minion(minion, salt_cli):
+     assert minion.is_running()
+     ret = salt_cli.run("test.ping", minion_tgt=minion.id)
+@@ -34,6 +35,7 @@ def test_minion(minion, salt_cli):
+     assert ret.json is True
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_no_match(minion, salt_cli):
+     assert minion.is_running()
+     ret = salt_cli.run("test.ping", minion_tgt="minion-2")
+@@ -41,6 +43,7 @@ def test_no_match(minion, salt_cli):
+     assert not ret.json
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_show_jid(minion, salt_cli):
+     assert minion.is_running()
+     ret = salt_cli.run("--show-jid", "test.ping", minion_tgt=minion.id)
+@@ -48,6 +51,7 @@ def test_show_jid(minion, salt_cli):
+     assert ret.json is True
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_minion_salt_call(minion, salt_call_cli):
+     assert minion.is_running()
+     ret = salt_call_cli.run("test.ping")
+@@ -59,6 +63,7 @@ def test_minion_salt_call(minion, salt_call_cli):
+     assert ret.json is True
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_salt_call_exception_handling_doesnt_timeout(minion, salt_call_cli):
+     ret = salt_call_cli.run(
+         "test.raise_exception", "OSError", "2", "No such file or directory", "/tmp/foo.txt"
+diff --git a/tests/integration/factories/daemons/minion/test_restarts.py b/tests/integration/factories/daemons/minion/test_restarts.py
+index a7d9ae0..8f0401b 100644
+--- a/tests/integration/factories/daemons/minion/test_restarts.py
++++ b/tests/integration/factories/daemons/minion/test_restarts.py
+@@ -10,6 +10,7 @@ def master(salt_factories):
+         yield factory
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_multiple_start_stops(master):
+     factory = master.get_salt_minion_daemon(random_string("minion-"))
+     assert factory.is_running() is False
+diff --git a/tests/integration/factories/daemons/proxy/test_proxy_minion.py b/tests/integration/factories/daemons/proxy/test_proxy_minion.py
+index 3bbca21..2e2fb8b 100644
+--- a/tests/integration/factories/daemons/proxy/test_proxy_minion.py
++++ b/tests/integration/factories/daemons/proxy/test_proxy_minion.py
+@@ -35,6 +35,7 @@ def salt_call_cli(proxy_minion):
+     return proxy_minion.get_salt_call_cli()
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_proxy_minion(proxy_minion, salt_cli):
+     assert proxy_minion.is_running()
+     ret = salt_cli.run("test.ping", minion_tgt=proxy_minion.id)
+@@ -42,6 +43,7 @@ def test_proxy_minion(proxy_minion, salt_cli):
+     assert ret.json is True
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_no_match(proxy_minion, salt_cli):
+     assert proxy_minion.is_running()
+     ret = salt_cli.run("test.ping", minion_tgt="proxy-minion-2")
+@@ -49,6 +51,7 @@ def test_no_match(proxy_minion, salt_cli):
+     assert not ret.json
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_show_jid(proxy_minion, salt_cli):
+     if platform.is_darwin() and sys.version_info[:2] == (3, 7):
+         pytest.skip(
+@@ -61,6 +64,7 @@ def test_show_jid(proxy_minion, salt_cli):
+     assert ret.json is True
+ 
+ 
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_proxy_minion_salt_call(proxy_minion, salt_call_cli):
+     assert proxy_minion.is_running()
+     ret = salt_call_cli.run("test.ping")
+diff --git a/tests/integration/factories/daemons/proxy/test_restarts.py b/tests/integration/factories/daemons/proxy/test_restarts.py
+index 3101204..28652ff 100644
+--- a/tests/integration/factories/daemons/proxy/test_restarts.py
++++ b/tests/integration/factories/daemons/proxy/test_restarts.py
+@@ -17,6 +17,7 @@ def master(salt_factories):
+         yield factory
+ 
+ 
++@pytest.mark.skip("not compatible with sandbox")
+ def test_multiple_start_stops(master):
+     factory = master.get_salt_proxy_minion_daemon(random_string("proxy-minion-"))
+     assert factory.is_running() is False
+diff --git a/tests/integration/factories/daemons/ssh/test_salt_ssh.py b/tests/integration/factories/daemons/ssh/test_salt_ssh.py
+index f58eac4..c3df3de 100644
+--- a/tests/integration/factories/daemons/ssh/test_salt_ssh.py
++++ b/tests/integration/factories/daemons/ssh/test_salt_ssh.py
+@@ -51,6 +51,7 @@ def salt_ssh_cli(sshd, salt_factories, master):
+ 
+ 
+ @pytest.mark.skip_on_windows
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_salt_ssh(salt_ssh_cli):
+     ret = salt_ssh_cli.run("--ignore-host-keys", "test.echo", "It Works!", minion_tgt="localhost")
+     assert ret.exitcode == 0
+diff --git a/tests/integration/factories/daemons/sshd/test_sshd.py b/tests/integration/factories/daemons/sshd/test_sshd.py
+index 3b425fc..3e03636 100644
+--- a/tests/integration/factories/daemons/sshd/test_sshd.py
++++ b/tests/integration/factories/daemons/sshd/test_sshd.py
+@@ -5,6 +5,7 @@ import pytest
+ 
+ @pytest.fixture(scope="module")
+ @pytest.mark.skip_if_binaries_missing("sshd", "ssh-keygen")
++@pytest.mark.skip("not compatible with network-sandbox")
+ def sshd(salt_factories):
+     # Set StrictModes to no because our config directory lives in /tmp and those permissions
+     # are not acceptable by sshd strict paranoia.
+@@ -15,12 +16,14 @@ def sshd(salt_factories):
+ 
+ 
+ @pytest.mark.skip_on_windows
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_sshd(sshd):
+     assert sshd.is_running()
+ 
+ 
+ @pytest.mark.skip_on_windows
+ @pytest.mark.skip_if_binaries_missing("ssh")
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_connect(sshd):
+     cmd = subprocess.run(
+         [
+diff --git a/tests/unit/utils/markers/test_skip_if_no_remote_network.py b/tests/unit/utils/markers/test_skip_if_no_remote_network.py
+index 1aa72dc..c4d079e 100644
+--- a/tests/unit/utils/markers/test_skip_if_no_remote_network.py
++++ b/tests/unit/utils/markers/test_skip_if_no_remote_network.py
+@@ -9,7 +9,10 @@ from unittest import mock
+ import saltfactories.utils.markers as markers
+ from saltfactories.utils import socket
+ 
++import pytest
+ 
++
++@pytest.mark.skip("not compatible with network-sandbox")
+ def test_has_remote_network():
+     assert markers.skip_if_no_remote_network() is None
+ 
diff --git a/dev-python/pytest-salt-factories/files/pytest-salt-factories-0.911.0-tests.patch b/dev-python/pytest-salt-factories/files/pytest-salt-factories-1.0.0_rc13-tests.patch
index 687b6a41b901..b021dcccf280 100644
--- a/dev-python/pytest-salt-factories/files/pytest-salt-factories-0.911.0-tests.patch
+++ b/dev-python/pytest-salt-factories/files/pytest-salt-factories-1.0.0_rc13-tests.patch
@@ -1,5 +1,5 @@
 diff --git a/src/saltfactories/plugins/__init__.py b/src/saltfactories/plugins/__init__.py
-index 679acad..ea6f23f 100644
+index 361414a..55469e4 100644
 --- a/src/saltfactories/plugins/__init__.py
 +++ b/src/saltfactories/plugins/__init__.py
 @@ -27,7 +27,7 @@ def pytest_tempdir_temproot():
@@ -12,7 +12,7 @@ index 679acad..ea6f23f 100644
  
  def pytest_tempdir_basename():
 diff --git a/tests/functional/factories/base/test_salt_daemon_factory.py b/tests/functional/factories/base/test_salt_daemon_factory.py
-index 813e36c..2b2b3d8 100644
+index eae5670..fd312df 100644
 --- a/tests/functional/factories/base/test_salt_daemon_factory.py
 +++ b/tests/functional/factories/base/test_salt_daemon_factory.py
 @@ -35,7 +35,7 @@ def test_extra_cli_arguments_after_first_failure(
@@ -24,27 +24,25 @@ index 813e36c..2b2b3d8 100644
      config = {"conf_file": config_file, "id": master_id}
      script = tempfiles.makepyfile(
          r"""
-diff --git a/tests/functional/markers/test_requires_network.py b/tests/functional/markers/test_requires_network.py
-index 0b21ede..70343fb 100644
---- a/tests/functional/markers/test_requires_network.py
-+++ b/tests/functional/markers/test_requires_network.py
-@@ -9,7 +9,9 @@ from unittest import mock
- from saltfactories.utils import ports
- from saltfactories.utils import socket
+diff --git a/tests/functional/factories/daemons/test_container_factory.py b/tests/functional/factories/daemons/test_container_factory.py
+index 1642d57..8b085eb 100644
+--- a/tests/functional/factories/daemons/test_container_factory.py
++++ b/tests/functional/factories/daemons/test_container_factory.py
+@@ -3,6 +3,7 @@ from unittest import mock
+ import pytest
  
-+import pytest
  
-+@pytest.mark.skip("Incompatible with network-sandbox")
- def test_has_local_network(pytester):
++@pytest.mark.skip("Needs network access")
+ @pytest.mark.parametrize("skip_on_pull_failure", [True, False])
+ def test_skip_on_pull_failure(pytester, skip_on_pull_failure):
      pytester.makepyfile(
-         """
 diff --git a/tests/functional/markers/test_requires_salt_modules.py b/tests/functional/markers/test_requires_salt_modules.py
-index 034d5e6..6e50a22 100644
+index 97ed1ec..53ff0dd 100644
 --- a/tests/functional/markers/test_requires_salt_modules.py
 +++ b/tests/functional/markers/test_requires_salt_modules.py
-@@ -4,9 +4,11 @@
- 
-     Test the ``@pytest.mark.requires_salt_modules`` marker
+@@ -1,9 +1,11 @@
+ """
+ Test the ``@pytest.mark.requires_salt_modules`` marker.
  """
 +import sys
  import pytest
@@ -54,7 +52,7 @@ index 034d5e6..6e50a22 100644
  @pytest.mark.parametrize(
      "modules",
      [
-@@ -31,6 +33,7 @@ def test_has_required_salt_module(pytester, modules):
+@@ -29,6 +31,7 @@ def test_has_required_salt_module(pytester, modules):
      res.stdout.no_fnmatch_line("*PytestUnknownMarkWarning*")
  
  
@@ -62,7 +60,7 @@ index 034d5e6..6e50a22 100644
  @pytest.mark.parametrize(
      "modules",
      [
-@@ -55,6 +58,7 @@ def test_missing_required_salt_module(pytester, modules):
+@@ -54,6 +57,7 @@ def test_missing_required_salt_module(pytester, modules):
      res.stdout.no_fnmatch_line("*PytestUnknownMarkWarning*")
  
  
@@ -71,12 +69,12 @@ index 034d5e6..6e50a22 100644
      pytester.makepyfile(
          r"""
 diff --git a/tests/functional/markers/test_requires_salt_states.py b/tests/functional/markers/test_requires_salt_states.py
-index 6ec469d..79d9052 100644
+index f6d63a9..ec4b431 100644
 --- a/tests/functional/markers/test_requires_salt_states.py
 +++ b/tests/functional/markers/test_requires_salt_states.py
-@@ -4,9 +4,11 @@
- 
-     Test the ``@pytest.mark.requires_salt_states`` marker
+@@ -1,9 +1,11 @@
+ """
+ Test the ``@pytest.mark.requires_salt_states`` marker.
  """
 +import sys
  import pytest
@@ -86,7 +84,7 @@ index 6ec469d..79d9052 100644
  @pytest.mark.parametrize(
      "modules",
      [
-@@ -31,6 +33,7 @@ def test_has_required_salt_state(pytester, modules):
+@@ -29,6 +31,7 @@ def test_has_required_salt_state(pytester, modules):
      res.stdout.no_fnmatch_line("*PytestUnknownMarkWarning*")
  
  
@@ -94,7 +92,7 @@ index 6ec469d..79d9052 100644
  @pytest.mark.parametrize(
      "modules",
      [
-@@ -55,6 +58,7 @@ def test_missing_required_salt_state(pytester, modules):
+@@ -54,6 +57,7 @@ def test_missing_required_salt_state(pytester, modules):
      res.stdout.no_fnmatch_line("*PytestUnknownMarkWarning*")
  
  
@@ -103,12 +101,12 @@ index 6ec469d..79d9052 100644
      pytester.makepyfile(
          r"""
 diff --git a/tests/functional/test_sys_info.py b/tests/functional/test_sys_info.py
-index 61963e0..e1e7531 100644
+index c8fbf6e..f18c85d 100644
 --- a/tests/functional/test_sys_info.py
 +++ b/tests/functional/test_sys_info.py
-@@ -4,9 +4,11 @@
- 
-     Tests related to system information reports enabled by the `--sys-info` flag.
+@@ -1,9 +1,11 @@
+ """
+ Tests related to system information reports enabled by the `--sys-info` flag..
  """
 +import sys
  import pytest
@@ -118,7 +116,7 @@ index 61963e0..e1e7531 100644
  @pytest.mark.parametrize("flag", ["--sysinfo", "--sys-info"])
  def test_sysinfo(pytester, flag):
      pytester.makepyfile(
-@@ -30,6 +32,7 @@ def test_sysinfo(pytester, flag):
+@@ -27,6 +29,7 @@ def test_sysinfo(pytester, flag):
      )
  
  
@@ -127,27 +125,27 @@ index 61963e0..e1e7531 100644
      pytester.makepyfile(
          """
 diff --git a/tests/integration/factories/cli/test_salt.py b/tests/integration/factories/cli/test_salt.py
-index 91babb9..bc9e854 100644
+index 9c4fdb0..0766fe7 100644
 --- a/tests/integration/factories/cli/test_salt.py
 +++ b/tests/integration/factories/cli/test_salt.py
-@@ -17,6 +17,7 @@ def salt_minion_2(salt_master, salt_minion):
+@@ -14,6 +14,7 @@ def salt_minion_2(salt_master, salt_minion):
          yield factory
  
  
 +@pytest.mark.skip("not compatible with network-sandbox")
  def test_merged_json_out(salt_cli, salt_minion, salt_minion_2):
      ret = salt_cli.run("test.ping", minion_tgt="*")
-     assert ret.exitcode == 0, ret
-@@ -27,6 +28,7 @@ def test_merged_json_out(salt_cli, salt_minion, salt_minion_2):
-     assert ret.json[salt_minion_2.id] is True
+     assert ret.returncode == 0, ret
+@@ -24,6 +25,7 @@ def test_merged_json_out(salt_cli, salt_minion, salt_minion_2):
+     assert ret.data[salt_minion_2.id] is True
  
  
 +@pytest.mark.skip("not compatible with network-sandbox")
  def test_merged_json_out_disabled(salt_cli, salt_minion, salt_minion_2):
      ret = salt_cli.run("test.ping", minion_tgt="*", merge_json_output=False)
-     assert ret.exitcode == 0, ret
+     assert ret.returncode == 0, ret
 diff --git a/tests/integration/factories/daemons/api/test_api.py b/tests/integration/factories/daemons/api/test_api.py
-index 8202585..0e57d98 100644
+index d6fd060..aade16e 100644
 --- a/tests/integration/factories/daemons/api/test_api.py
 +++ b/tests/integration/factories/daemons/api/test_api.py
 @@ -19,5 +19,6 @@ def salt_api(master):
@@ -158,7 +156,7 @@ index 8202585..0e57d98 100644
  def test_api(salt_api):
      assert salt_api.is_running()
 diff --git a/tests/integration/factories/daemons/api/test_restarts.py b/tests/integration/factories/daemons/api/test_restarts.py
-index 7b91c33..7cd633a 100644
+index bfab01f..0494ebb 100644
 --- a/tests/integration/factories/daemons/api/test_restarts.py
 +++ b/tests/integration/factories/daemons/api/test_restarts.py
 @@ -12,6 +12,7 @@ def master(salt_factories):
@@ -170,16 +168,15 @@ index 7b91c33..7cd633a 100644
      factory = master.salt_api_daemon()
      assert factory.is_running() is False
 diff --git a/tests/integration/factories/daemons/master/test_master.py b/tests/integration/factories/daemons/master/test_master.py
-index e3c20e4..9be3631 100644
+index 6ae19f0..b93f773 100644
 --- a/tests/integration/factories/daemons/master/test_master.py
 +++ b/tests/integration/factories/daemons/master/test_master.py
-@@ -1,4 +1,5 @@
- import os
+@@ -1,3 +1,4 @@
 +import sys
- import tempfile
- 
  import pytest
-@@ -51,10 +52,12 @@ def salt_call(minion):
+ import salt.defaults.exitcodes
+ from pytestshellutils.exceptions import FactoryNotStarted
+@@ -48,10 +49,12 @@ def salt_call(minion):
      return minion.salt_call_cli()
  
  
@@ -192,31 +189,15 @@ index e3c20e4..9be3631 100644
  def test_salt_run(master, salt_run):
      max_open_files_config_value = master.config["max_open_files"]
      ret = salt_run.run("config.get", "max_open_files")
-@@ -62,6 +65,7 @@ def test_salt_run(master, salt_run):
-     assert ret.json == max_open_files_config_value
- 
- 
-+@pytest.mark.skip("not compatible with network-sandbox")
- def test_salt_cp(master, minion, salt_cp, tempfiles):
-     """
-     Test copying a file from the master to the minion
-@@ -103,6 +107,7 @@ def test_salt_cp(master, minion, salt_cp, tempfiles):
-             os.unlink(dest)
- 
- 
-+@pytest.mark.skip("not compatible with network-sandbox")
- def test_salt_cp_no_match(master, minion, salt_cp, tempfiles):
-     assert master.is_running()
-     assert minion.is_running()
-@@ -124,6 +129,7 @@ def test_salt_cp_no_match(master, minion, salt_cp, tempfiles):
-             os.unlink(dest)
+@@ -117,6 +120,7 @@ def test_state_tree(master, salt_call, minion):
+         assert ret.returncode == 0
  
  
 +@pytest.mark.skip("not compatible with sandbox")
  @pytest.mark.skip_on_salt_system_install
- def test_salt_key(master, minion, minion_3, salt_key):
+ def test_salt_key(minion, minion_3, salt_key):
      ret = salt_key.run("--list-all")
-@@ -138,6 +144,7 @@ def test_salt_key(master, minion, minion_3, salt_key):
+@@ -131,6 +135,7 @@ def test_salt_key(minion, minion_3, salt_key):
  
  @pytest.mark.skip_on_windows
  @pytest.mark.skip_on_salt_system_install
@@ -224,14 +205,6 @@ index e3c20e4..9be3631 100644
  def test_exit_status_unknown_user(salt_factories):
      master = salt_factories.salt_master_daemon("set-exitcodes", overrides={"user": "unknown-user"})
      with pytest.raises(FactoryNotStarted) as exc:
-@@ -147,6 +154,7 @@ def test_exit_status_unknown_user(salt_factories):
-     assert "The user is not available." in exc.value.stderr, str(exc.value)
- 
- 
-+@pytest.mark.skip("not compatible with sandbox")
- def test_state_tree(master, salt_call):
-     sls_contents = """
-     test:
 diff --git a/tests/integration/factories/daemons/master/test_restarts.py b/tests/integration/factories/daemons/master/test_restarts.py
 index 683970a..443dcfb 100644
 --- a/tests/integration/factories/daemons/master/test_restarts.py
@@ -245,7 +218,7 @@ index 683970a..443dcfb 100644
      assert master.is_running() is False
      pid = None
 diff --git a/tests/integration/factories/daemons/minion/test_event_forwarder_engine.py b/tests/integration/factories/daemons/minion/test_event_forwarder_engine.py
-index 7983e29..ac1085d 100644
+index a6c6420..10626cd 100644
 --- a/tests/integration/factories/daemons/minion/test_event_forwarder_engine.py
 +++ b/tests/integration/factories/daemons/minion/test_event_forwarder_engine.py
 @@ -28,6 +28,7 @@ def salt_call_cli(minion):
@@ -257,7 +230,7 @@ index 7983e29..ac1085d 100644
      """
      There are some events which the minion fires internally that never reach the master.
 diff --git a/tests/integration/factories/daemons/minion/test_minion.py b/tests/integration/factories/daemons/minion/test_minion.py
-index 8e73efc..4501f9d 100644
+index 387e789..1e4ecfd 100644
 --- a/tests/integration/factories/daemons/minion/test_minion.py
 +++ b/tests/integration/factories/daemons/minion/test_minion.py
 @@ -27,6 +27,7 @@ def salt_call_cli(minion):
@@ -269,7 +242,7 @@ index 8e73efc..4501f9d 100644
      assert minion.is_running()
      ret = salt_cli.run("test.ping", minion_tgt=minion.id)
 @@ -34,6 +35,7 @@ def test_minion(minion, salt_cli):
-     assert ret.json is True
+     assert ret.data is True
  
  
 +@pytest.mark.skip("not compatible with network-sandbox")
@@ -277,7 +250,7 @@ index 8e73efc..4501f9d 100644
      assert minion.is_running()
      ret = salt_cli.run("test.ping", minion_tgt="minion-2")
 @@ -41,6 +43,7 @@ def test_no_match(minion, salt_cli):
-     assert not ret.json
+     assert not ret.data
  
  
 +@pytest.mark.skip("not compatible with network-sandbox")
@@ -285,7 +258,7 @@ index 8e73efc..4501f9d 100644
      assert minion.is_running()
      ret = salt_cli.run("--show-jid", "test.ping", minion_tgt=minion.id)
 @@ -48,6 +51,7 @@ def test_show_jid(minion, salt_cli):
-     assert ret.json is True
+     assert ret.data is True
  
  
 +@pytest.mark.skip("not compatible with network-sandbox")
@@ -293,7 +266,7 @@ index 8e73efc..4501f9d 100644
      assert minion.is_running()
      ret = salt_call_cli.run("test.ping")
 @@ -59,6 +63,7 @@ def test_minion_salt_call(minion, salt_call_cli):
-     assert ret.json is True
+     assert ret.data is True
  
  
 +@pytest.mark.skip("not compatible with network-sandbox")
@@ -301,7 +274,7 @@ index 8e73efc..4501f9d 100644
      ret = salt_call_cli.run(
          "test.raise_exception", "OSError", "2", "No such file or directory", "/tmp/foo.txt"
 @@ -66,6 +71,7 @@ def test_salt_call_exception_handling_doesnt_timeout(minion, salt_call_cli):
-     assert ret.exitcode == 1, ret
+     assert ret.returncode == 1, ret
  
  
 +@pytest.mark.skip("not compatible with sandbox")
@@ -321,10 +294,10 @@ index ab1f044..4ac417d 100644
      factory = master.salt_minion_daemon(random_string("minion-"))
      assert factory.is_running() is False
 diff --git a/tests/integration/factories/daemons/proxy/test_proxy_minion.py b/tests/integration/factories/daemons/proxy/test_proxy_minion.py
-index 926e6ac..f30c986 100644
+index 1c58628..807cbe7 100644
 --- a/tests/integration/factories/daemons/proxy/test_proxy_minion.py
 +++ b/tests/integration/factories/daemons/proxy/test_proxy_minion.py
-@@ -35,6 +35,7 @@ def salt_call_cli(proxy_minion):
+@@ -36,6 +36,7 @@ def salt_call_cli(proxy_minion):
      return proxy_minion.salt_call_cli()
  
  
@@ -332,32 +305,32 @@ index 926e6ac..f30c986 100644
  def test_proxy_minion(proxy_minion, salt_cli):
      assert proxy_minion.is_running()
      ret = salt_cli.run("test.ping", minion_tgt=proxy_minion.id)
-@@ -42,6 +43,7 @@ def test_proxy_minion(proxy_minion, salt_cli):
-     assert ret.json is True
+@@ -43,6 +44,7 @@ def test_proxy_minion(proxy_minion, salt_cli):
+     assert ret.data is True
  
  
 +@pytest.mark.skip("not compatible with network-sandbox")
  def test_no_match(proxy_minion, salt_cli):
      assert proxy_minion.is_running()
      ret = salt_cli.run("test.ping", minion_tgt="proxy-minion-2")
-@@ -49,6 +51,7 @@ def test_no_match(proxy_minion, salt_cli):
-     assert not ret.json
+@@ -50,6 +52,7 @@ def test_no_match(proxy_minion, salt_cli):
+     assert not ret.data
  
  
 +@pytest.mark.skip("not compatible with network-sandbox")
  def test_show_jid(proxy_minion, salt_cli):
      if platform.is_darwin() and sys.version_info[:2] == (3, 7):
          pytest.skip(
-@@ -61,6 +64,7 @@ def test_show_jid(proxy_minion, salt_cli):
-     assert ret.json is True
+@@ -62,6 +65,7 @@ def test_show_jid(proxy_minion, salt_cli):
+     assert ret.data is True
  
  
 +@pytest.mark.skip("not compatible with network-sandbox")
  def test_proxy_minion_salt_call(proxy_minion, salt_call_cli):
      assert proxy_minion.is_running()
      ret = salt_call_cli.run("test.ping")
-@@ -72,6 +76,7 @@ def test_proxy_minion_salt_call(proxy_minion, salt_call_cli):
-     assert ret.json is True
+@@ -73,6 +77,7 @@ def test_proxy_minion_salt_call(proxy_minion, salt_call_cli):
+     assert ret.data is True
  
  
 +@pytest.mark.skip("not compatible with sandbox")
@@ -365,10 +338,10 @@ index 926e6ac..f30c986 100644
      sls_contents = """
      test:
 diff --git a/tests/integration/factories/daemons/proxy/test_restarts.py b/tests/integration/factories/daemons/proxy/test_restarts.py
-index 22ef97d..c781059 100644
+index a243c6d..7758c96 100644
 --- a/tests/integration/factories/daemons/proxy/test_restarts.py
 +++ b/tests/integration/factories/daemons/proxy/test_restarts.py
-@@ -17,6 +17,7 @@ def master(salt_factories):
+@@ -16,6 +16,7 @@ def master(salt_factories):
          yield factory
  
  
@@ -377,7 +350,7 @@ index 22ef97d..c781059 100644
      factory = master.salt_proxy_minion_daemon(random_string("proxy-minion-"))
      assert factory.is_running() is False
 diff --git a/tests/integration/factories/daemons/ssh/test_salt_ssh.py b/tests/integration/factories/daemons/ssh/test_salt_ssh.py
-index e74471a..a288b6b 100644
+index 37e2449..73ac893 100644
 --- a/tests/integration/factories/daemons/ssh/test_salt_ssh.py
 +++ b/tests/integration/factories/daemons/ssh/test_salt_ssh.py
 @@ -51,6 +51,7 @@ def salt_ssh_cli(sshd, salt_factories, master):
@@ -387,7 +360,7 @@ index e74471a..a288b6b 100644
 +@pytest.mark.skip("not compatible with network-sandbox")
  def test_salt_ssh(salt_ssh_cli):
      ret = salt_ssh_cli.run("--ignore-host-keys", "test.echo", "It Works!", minion_tgt="localhost")
-     assert ret.exitcode == 0
+     assert ret.returncode == 0
 diff --git a/tests/integration/factories/daemons/sshd/test_sshd.py b/tests/integration/factories/daemons/sshd/test_sshd.py
 index 3b425fc..3e03636 100644
 --- a/tests/integration/factories/daemons/sshd/test_sshd.py
@@ -416,7 +389,7 @@ index 3b425fc..3e03636 100644
      cmd = subprocess.run(
          [
 diff --git a/tests/integration/utils/saltext/test_log_handlers.py b/tests/integration/utils/saltext/test_log_handlers.py
-index 96ad66d..118062b 100644
+index 6d5b9c0..edc5b5a 100644
 --- a/tests/integration/utils/saltext/test_log_handlers.py
 +++ b/tests/integration/utils/saltext/test_log_handlers.py
 @@ -24,6 +24,7 @@ def salt_cli(master):
@@ -428,7 +401,7 @@ index 96ad66d..118062b 100644
      assert minion.is_running()
  
 diff --git a/tests/scenarios/examples/test_echoext.py b/tests/scenarios/examples/test_echoext.py
-index 3d5ce65..5fd503f 100644
+index 238a442..d827467 100644
 --- a/tests/scenarios/examples/test_echoext.py
 +++ b/tests/scenarios/examples/test_echoext.py
 @@ -1,6 +1,8 @@
@@ -440,30 +413,3 @@ index 3d5ce65..5fd503f 100644
  def test_echoext(extension_venv):
      extension_path = CODE_ROOT_DIR.parent.parent / "examples" / "echo-extension"
      with extension_venv(extension_path) as venv:
-diff --git a/tests/unit/utils/markers/test_skip_if_no_remote_network.py b/tests/unit/utils/markers/test_skip_if_no_remote_network.py
-index 1aa72dc..c4d079e 100644
---- a/tests/unit/utils/markers/test_skip_if_no_remote_network.py
-+++ b/tests/unit/utils/markers/test_skip_if_no_remote_network.py
-@@ -9,7 +9,10 @@ from unittest import mock
- import saltfactories.utils.markers as markers
- from saltfactories.utils import socket
- 
-+import pytest
- 
-+
-+@pytest.mark.skip("not compatible with network-sandbox")
- def test_has_remote_network():
-     assert markers.skip_if_no_remote_network() is None
- 
-diff --git a/tests/unit/utils/test_platform.py b/tests/unit/utils/test_platform.py
-index 28dac0c..b28bcbb 100644
---- a/tests/unit/utils/test_platform.py
-+++ b/tests/unit/utils/test_platform.py
-@@ -120,6 +120,7 @@ def test_is_not_aix():
-         assert saltfactories.utils.platform.is_aix() is return_value
- 
- 
-+@pytest.mark.skip("Doesn't work with salt-3004")
- def test_is_aarch64():
-     return_value = True
-     with mock.patch("sys.platform", "aarch64"):
diff --git a/dev-python/pytest-salt-factories/pytest-salt-factories-0.911.0.ebuild b/dev-python/pytest-salt-factories/pytest-salt-factories-0.121.1-r1.ebuild
index 92e0c7b41f95..e4d2f0f1ee31 100644
--- a/dev-python/pytest-salt-factories/pytest-salt-factories-0.911.0.ebuild
+++ b/dev-python/pytest-salt-factories/pytest-salt-factories-0.121.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=8
+EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
@@ -16,25 +16,18 @@ KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 
 RDEPEND="
+	>=dev-python/pytest-6.1.1[${PYTHON_USEDEP}]
 	dev-python/attrs[${PYTHON_USEDEP}]
 	dev-python/pytest-tempdir[${PYTHON_USEDEP}]
 	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
-	dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
 	dev-python/pyzmq[${PYTHON_USEDEP}]
 	dev-python/msgpack[${PYTHON_USEDEP}]
 	>=app-admin/salt-3001.0[${PYTHON_USEDEP}]
 "
-BDEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-		dev-python/pytest-subtests[${PYTHON_USEDEP}]
-	)
-"
+BDEPEND="${RDEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/pytest-salt-factories-0.911.0-tests.patch"
+	"${FILESDIR}/pytest-salt-factories-0.121.1-tests.patch"
 )
 
 distutils_enable_tests --install pytest
@@ -44,7 +37,7 @@ python_prepare_all() {
 	sed -r -e '/(setuptools|setup_requires)/ d' -i setup.cfg || die
 
 	sed -i 's:tool.setuptools_scm:tool.disabled:' pyproject.toml || die
-	printf '__version__ = "%s"\n' "${PV}" > src/saltfactories/version.py || die
+	printf '__version__ = "%s"\n' "${PV}" > saltfactories/version.py || die
 	distutils-r1_python_prepare_all
 }
 
@@ -64,7 +57,7 @@ python_test() {
 		cleanup() { rm -f "${tempdir}" || die; }
 
 		trap cleanup EXIT
-		env SHELL="/bin/bash" TMPDIR="${tempdir}" \
+		SHELL="/bin/bash" TMPDIR="${tempdir}" \
 			pytest -vv || die "Tests failed with ${EPYTHON}"
 	)
 }
diff --git a/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc13.ebuild b/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc13.ebuild
new file mode 100644
index 000000000000..b6350e8a385e
--- /dev/null
+++ b/dev-python/pytest-salt-factories/pytest-salt-factories-1.0.0_rc13.ebuild
@@ -0,0 +1,72 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="The new generation of the pytest-salt Plugin"
+HOMEPAGE="https://github.com/saltstack/pytest-salt-factories"
+SRC_URI="https://github.com/saltstack/${PN}/archive/${PV//_/}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/${PN}-${PV//_/}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE="test"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/pytest-tempdir[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
+	dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
+	dev-python/pytest-skip-markers[${PYTHON_USEDEP}]
+	dev-python/pytest-system-statistics[${PYTHON_USEDEP}]
+	dev-python/pytest-shell-utilities[${PYTHON_USEDEP}]
+	dev-python/pyzmq[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/virtualenv[${PYTHON_USEDEP}]
+	>=app-admin/salt-3001.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+		dev-python/pytest-subtests[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/pytest-salt-factories-1.0.0_rc13-tests.patch"
+)
+
+distutils_enable_tests --install pytest
+
+python_prepare_all() {
+	sed -r -e "s:use_scm_version=True:version='${PV}', name='${PN//-/.}':" -i setup.py || die
+	sed -r -e '/(setuptools|setup_requires)/ d' -i setup.cfg || die
+
+	sed -i 's:tool.setuptools_scm:tool.disabled:' pyproject.toml || die
+	printf '__version__ = "%s"\n' "${PV}" > src/saltfactories/version.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local tempdir
+
+	# ${T} is too long a path for the tests to work
+	tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
+	addwrite "${tempdir}"
+
+	distutils_install_for_testing --via-root
+
+	(
+		cleanup() { rm -rf "${tempdir}" || die; }
+
+		trap cleanup EXIT
+		env SHELL="/bin/bash" TMPDIR="${tempdir}" \
+			pytest -vv -x || die "Tests failed with ${EPYTHON}"
+	)
+}