diff options
Diffstat (limited to 'dev-python/pytest-salt-factories/files')
-rw-r--r-- | dev-python/pytest-salt-factories/files/pytest-salt-factories-0.121.1-tests.patch | 294 | ||||
-rw-r--r-- | dev-python/pytest-salt-factories/files/pytest-salt-factories-1.0.0_rc13-tests.patch (renamed from dev-python/pytest-salt-factories/files/pytest-salt-factories-0.911.0-tests.patch) | 190 |
2 files changed, 362 insertions, 122 deletions
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"): |