Gentoo Archives: gentoo-commits

From: Patrick McLean <chutzpah@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pytest-salt-factories/, dev-python/pytest-salt-factories/files/
Date: Thu, 31 Mar 2022 02:03:35
Message-Id: 1648692200.f0edbf1a9b61b952675ef782fb785b4a9373ba01.chutzpah@gentoo
1 commit: f0edbf1a9b61b952675ef782fb785b4a9373ba01
2 Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
3 AuthorDate: Thu Mar 31 01:40:31 2022 +0000
4 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
5 CommitDate: Thu Mar 31 02:03:20 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0edbf1a
7
8 dev-python/pytest-salt-factories: drop 0.911.0
9
10 Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
11
12 dev-python/pytest-salt-factories/Manifest | 1 -
13 .../pytest-salt-factories-0.911.0-tests.patch | 469 ---------------------
14 .../pytest-salt-factories-0.911.0.ebuild | 70 ---
15 3 files changed, 540 deletions(-)
16
17 diff --git a/dev-python/pytest-salt-factories/Manifest b/dev-python/pytest-salt-factories/Manifest
18 index 05d7a46c3fb7..403aada1ee3e 100644
19 --- a/dev-python/pytest-salt-factories/Manifest
20 +++ b/dev-python/pytest-salt-factories/Manifest
21 @@ -1,3 +1,2 @@
22 DIST pytest-salt-factories-0.121.1.tar.gz 102121 BLAKE2B 92cd5953b11377f1646f01b86a677a50216d16bcb944235a3f04176aecbb005974c415adcbf23cc391aab41b1ee9596984516ab61ecdd8c944d4ce707c39ab00 SHA512 32252695c6e8b17ef17d3330c4b0b38bdce89201d5573b4efa3531a72e826ee1fb26fea3ad0408401dec867cee405f21031804c32eb8fe6ceaa00925b17725a1
23 -DIST pytest-salt-factories-0.911.0.tar.gz 161682 BLAKE2B b5a827c9a9acc55c53bc4152b648f96845f513e2d1c8425cbde0862909996a653df4debbf798a3d7461da4fc221acd5fc8e6052e123f3e64e0c8f4345557f141 SHA512 bada21cfe990ccb10b0e298cb05a7f3842d0fe24e2c8664352ae991363d0094dd1ff877adea5fcc0c1040e3f20f82ba616607c595511cade93ebadddd336a26b
24 DIST pytest-salt-factories-1.0.0_rc13.tar.gz 148418 BLAKE2B 3688f05d137df23266ebc7e999bc3b3a8ec198173b38dc98bd4a1e2655b982a37485278691e970da0be700cee6f609c57933b041a6d8403e75fb197f5d23d5d4 SHA512 f3713410704540ee48b7263973d3a9bf3159fb63e53e5ef5002201aea3fdcf0b4eaf00e1dd1e67d869b42242985d8117a117568d63abf5ad366e247fb3e1d83f
25
26 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-0.911.0-tests.patch
27 deleted file mode 100644
28 index 687b6a41b901..000000000000
29 --- a/dev-python/pytest-salt-factories/files/pytest-salt-factories-0.911.0-tests.patch
30 +++ /dev/null
31 @@ -1,469 +0,0 @@
32 -diff --git a/src/saltfactories/plugins/__init__.py b/src/saltfactories/plugins/__init__.py
33 -index 679acad..ea6f23f 100644
34 ---- a/src/saltfactories/plugins/__init__.py
35 -+++ b/src/saltfactories/plugins/__init__.py
36 -@@ -27,7 +27,7 @@ def pytest_tempdir_temproot():
37 - tempdir = "/tmp"
38 - else:
39 - tempdir = os.environ.get("TMPDIR") or tempfile.gettempdir()
40 -- return os.path.abspath(os.path.realpath(tempdir))
41 -+ return tempdir
42 -
43 -
44 - def pytest_tempdir_basename():
45 -diff --git a/tests/functional/factories/base/test_salt_daemon_factory.py b/tests/functional/factories/base/test_salt_daemon_factory.py
46 -index 813e36c..2b2b3d8 100644
47 ---- a/tests/functional/factories/base/test_salt_daemon_factory.py
48 -+++ b/tests/functional/factories/base/test_salt_daemon_factory.py
49 -@@ -35,7 +35,7 @@ def test_extra_cli_arguments_after_first_failure(
50 - This test asserts that after the first start failure, the extra_cli_arguments_after_first_start_failure
51 - arguments are added
52 - """
53 -- output_file = tmp_path.joinpath("output.txt").resolve()
54 -+ output_file = tmp_path.joinpath("output.txt")
55 - config = {"conf_file": config_file, "id": master_id}
56 - script = tempfiles.makepyfile(
57 - r"""
58 -diff --git a/tests/functional/markers/test_requires_network.py b/tests/functional/markers/test_requires_network.py
59 -index 0b21ede..70343fb 100644
60 ---- a/tests/functional/markers/test_requires_network.py
61 -+++ b/tests/functional/markers/test_requires_network.py
62 -@@ -9,7 +9,9 @@ from unittest import mock
63 - from saltfactories.utils import ports
64 - from saltfactories.utils import socket
65 -
66 -+import pytest
67 -
68 -+@×××××××××××.skip("Incompatible with network-sandbox")
69 - def test_has_local_network(pytester):
70 - pytester.makepyfile(
71 - """
72 -diff --git a/tests/functional/markers/test_requires_salt_modules.py b/tests/functional/markers/test_requires_salt_modules.py
73 -index 034d5e6..6e50a22 100644
74 ---- a/tests/functional/markers/test_requires_salt_modules.py
75 -+++ b/tests/functional/markers/test_requires_salt_modules.py
76 -@@ -4,9 +4,11 @@
77 -
78 - Test the ``@pytest.mark.requires_salt_modules`` marker
79 - """
80 -+import sys
81 - import pytest
82 -
83 -
84 -+@×××××××××××.skipif(sys.version_info >= (3, 10), reason="test broken on python 3.10")
85 - @pytest.mark.parametrize(
86 - "modules",
87 - [
88 -@@ -31,6 +33,7 @@ def test_has_required_salt_module(pytester, modules):
89 - res.stdout.no_fnmatch_line("*PytestUnknownMarkWarning*")
90 -
91 -
92 -+@×××××××××××.skipif(sys.version_info >= (3, 10), reason="test broken on python 3.10")
93 - @pytest.mark.parametrize(
94 - "modules",
95 - [
96 -@@ -55,6 +58,7 @@ def test_missing_required_salt_module(pytester, modules):
97 - res.stdout.no_fnmatch_line("*PytestUnknownMarkWarning*")
98 -
99 -
100 -+@×××××××××××.skipif(sys.version_info >= (3, 10), reason="test broken on python 3.10")
101 - def test_has_required_custom_salt_module(pytester):
102 - pytester.makepyfile(
103 - r"""
104 -diff --git a/tests/functional/markers/test_requires_salt_states.py b/tests/functional/markers/test_requires_salt_states.py
105 -index 6ec469d..79d9052 100644
106 ---- a/tests/functional/markers/test_requires_salt_states.py
107 -+++ b/tests/functional/markers/test_requires_salt_states.py
108 -@@ -4,9 +4,11 @@
109 -
110 - Test the ``@pytest.mark.requires_salt_states`` marker
111 - """
112 -+import sys
113 - import pytest
114 -
115 -
116 -+@×××××××××××.skipif(sys.version_info >= (3, 10), reason="test broken on python 3.10")
117 - @pytest.mark.parametrize(
118 - "modules",
119 - [
120 -@@ -31,6 +33,7 @@ def test_has_required_salt_state(pytester, modules):
121 - res.stdout.no_fnmatch_line("*PytestUnknownMarkWarning*")
122 -
123 -
124 -+@×××××××××××.skipif(sys.version_info >= (3, 10), reason="test broken on python 3.10")
125 - @pytest.mark.parametrize(
126 - "modules",
127 - [
128 -@@ -55,6 +58,7 @@ def test_missing_required_salt_state(pytester, modules):
129 - res.stdout.no_fnmatch_line("*PytestUnknownMarkWarning*")
130 -
131 -
132 -+@×××××××××××.skipif(sys.version_info >= (3, 10), reason="test broken on python 3.10")
133 - def test_has_required_custom_salt_state(pytester):
134 - pytester.makepyfile(
135 - r"""
136 -diff --git a/tests/functional/test_sys_info.py b/tests/functional/test_sys_info.py
137 -index 61963e0..e1e7531 100644
138 ---- a/tests/functional/test_sys_info.py
139 -+++ b/tests/functional/test_sys_info.py
140 -@@ -4,9 +4,11 @@
141 -
142 - Tests related to system information reports enabled by the `--sys-info` flag.
143 - """
144 -+import sys
145 - import pytest
146 -
147 -
148 -+@×××××××××××.skipif(sys.version_info >= (3, 10), reason="test broken on python 3.10")
149 - @pytest.mark.parametrize("flag", ["--sysinfo", "--sys-info"])
150 - def test_sysinfo(pytester, flag):
151 - pytester.makepyfile(
152 -@@ -30,6 +32,7 @@ def test_sysinfo(pytester, flag):
153 - )
154 -
155 -
156 -+@×××××××××××.skipif(sys.version_info >= (3, 10), reason="test broken on python 3.10")
157 - def test_no_sysinfo(pytester):
158 - pytester.makepyfile(
159 - """
160 -diff --git a/tests/integration/factories/cli/test_salt.py b/tests/integration/factories/cli/test_salt.py
161 -index 91babb9..bc9e854 100644
162 ---- a/tests/integration/factories/cli/test_salt.py
163 -+++ b/tests/integration/factories/cli/test_salt.py
164 -@@ -17,6 +17,7 @@ def salt_minion_2(salt_master, salt_minion):
165 - yield factory
166 -
167 -
168 -+@×××××××××××.skip("not compatible with network-sandbox")
169 - def test_merged_json_out(salt_cli, salt_minion, salt_minion_2):
170 - ret = salt_cli.run("test.ping", minion_tgt="*")
171 - assert ret.exitcode == 0, ret
172 -@@ -27,6 +28,7 @@ def test_merged_json_out(salt_cli, salt_minion, salt_minion_2):
173 - assert ret.json[salt_minion_2.id] is True
174 -
175 -
176 -+@×××××××××××.skip("not compatible with network-sandbox")
177 - def test_merged_json_out_disabled(salt_cli, salt_minion, salt_minion_2):
178 - ret = salt_cli.run("test.ping", minion_tgt="*", merge_json_output=False)
179 - assert ret.exitcode == 0, ret
180 -diff --git a/tests/integration/factories/daemons/api/test_api.py b/tests/integration/factories/daemons/api/test_api.py
181 -index 8202585..0e57d98 100644
182 ---- a/tests/integration/factories/daemons/api/test_api.py
183 -+++ b/tests/integration/factories/daemons/api/test_api.py
184 -@@ -19,5 +19,6 @@ def salt_api(master):
185 - yield factory
186 -
187 -
188 -+@×××××××××××.skip("not compatible with network-sandbox")
189 - def test_api(salt_api):
190 - assert salt_api.is_running()
191 -diff --git a/tests/integration/factories/daemons/api/test_restarts.py b/tests/integration/factories/daemons/api/test_restarts.py
192 -index 7b91c33..7cd633a 100644
193 ---- a/tests/integration/factories/daemons/api/test_restarts.py
194 -+++ b/tests/integration/factories/daemons/api/test_restarts.py
195 -@@ -12,6 +12,7 @@ def master(salt_factories):
196 - yield factory
197 -
198 -
199 -+@×××××××××××.skip("not compatible with network-sandbox")
200 - def test_multiple_start_stops(master):
201 - factory = master.salt_api_daemon()
202 - assert factory.is_running() is False
203 -diff --git a/tests/integration/factories/daemons/master/test_master.py b/tests/integration/factories/daemons/master/test_master.py
204 -index e3c20e4..9be3631 100644
205 ---- a/tests/integration/factories/daemons/master/test_master.py
206 -+++ b/tests/integration/factories/daemons/master/test_master.py
207 -@@ -1,4 +1,5 @@
208 - import os
209 -+import sys
210 - import tempfile
211 -
212 - import pytest
213 -@@ -51,10 +52,12 @@ def salt_call(minion):
214 - return minion.salt_call_cli()
215 -
216 -
217 -+@×××××××××××.skip("not compatible with network-sandbox")
218 - def test_master(master):
219 - assert master.is_running()
220 -
221 -
222 -+@×××××××××××.skip("not compatible with network-sandbox")
223 - def test_salt_run(master, salt_run):
224 - max_open_files_config_value = master.config["max_open_files"]
225 - ret = salt_run.run("config.get", "max_open_files")
226 -@@ -62,6 +65,7 @@ def test_salt_run(master, salt_run):
227 - assert ret.json == max_open_files_config_value
228 -
229 -
230 -+@×××××××××××.skip("not compatible with network-sandbox")
231 - def test_salt_cp(master, minion, salt_cp, tempfiles):
232 - """
233 - Test copying a file from the master to the minion
234 -@@ -103,6 +107,7 @@ def test_salt_cp(master, minion, salt_cp, tempfiles):
235 - os.unlink(dest)
236 -
237 -
238 -+@×××××××××××.skip("not compatible with network-sandbox")
239 - def test_salt_cp_no_match(master, minion, salt_cp, tempfiles):
240 - assert master.is_running()
241 - assert minion.is_running()
242 -@@ -124,6 +129,7 @@ def test_salt_cp_no_match(master, minion, salt_cp, tempfiles):
243 - os.unlink(dest)
244 -
245 -
246 -+@×××××××××××.skip("not compatible with sandbox")
247 - @pytest.mark.skip_on_salt_system_install
248 - def test_salt_key(master, minion, minion_3, salt_key):
249 - ret = salt_key.run("--list-all")
250 -@@ -138,6 +144,7 @@ def test_salt_key(master, minion, minion_3, salt_key):
251 -
252 - @pytest.mark.skip_on_windows
253 - @pytest.mark.skip_on_salt_system_install
254 -+@×××××××××××.skipif(sys.version_info >= (3, 10), reason="test broken on python 3.10")
255 - def test_exit_status_unknown_user(salt_factories):
256 - master = salt_factories.salt_master_daemon("set-exitcodes", overrides={"user": "unknown-user"})
257 - with pytest.raises(FactoryNotStarted) as exc:
258 -@@ -147,6 +154,7 @@ def test_exit_status_unknown_user(salt_factories):
259 - assert "The user is not available." in exc.value.stderr, str(exc.value)
260 -
261 -
262 -+@×××××××××××.skip("not compatible with sandbox")
263 - def test_state_tree(master, salt_call):
264 - sls_contents = """
265 - test:
266 -diff --git a/tests/integration/factories/daemons/master/test_restarts.py b/tests/integration/factories/daemons/master/test_restarts.py
267 -index 683970a..443dcfb 100644
268 ---- a/tests/integration/factories/daemons/master/test_restarts.py
269 -+++ b/tests/integration/factories/daemons/master/test_restarts.py
270 -@@ -11,6 +11,7 @@ def master(salt_factories):
271 - return factory
272 -
273 -
274 -+@×××××××××××.skip("not compatible with network")
275 - def test_multiple_start_stops(master):
276 - assert master.is_running() is False
277 - pid = None
278 -diff --git a/tests/integration/factories/daemons/minion/test_event_forwarder_engine.py b/tests/integration/factories/daemons/minion/test_event_forwarder_engine.py
279 -index 7983e29..ac1085d 100644
280 ---- a/tests/integration/factories/daemons/minion/test_event_forwarder_engine.py
281 -+++ b/tests/integration/factories/daemons/minion/test_event_forwarder_engine.py
282 -@@ -28,6 +28,7 @@ def salt_call_cli(minion):
283 - return minion.salt_call_cli()
284 -
285 -
286 -+@×××××××××××.skip("not compatible with network-sandbox")
287 - def test_event_listener_engine(minion, salt_call_cli, event_listener):
288 - """
289 - There are some events which the minion fires internally that never reach the master.
290 -diff --git a/tests/integration/factories/daemons/minion/test_minion.py b/tests/integration/factories/daemons/minion/test_minion.py
291 -index 8e73efc..4501f9d 100644
292 ---- a/tests/integration/factories/daemons/minion/test_minion.py
293 -+++ b/tests/integration/factories/daemons/minion/test_minion.py
294 -@@ -27,6 +27,7 @@ def salt_call_cli(minion):
295 - return minion.salt_call_cli()
296 -
297 -
298 -+@×××××××××××.skip("not compatible with network-sandbox")
299 - def test_minion(minion, salt_cli):
300 - assert minion.is_running()
301 - ret = salt_cli.run("test.ping", minion_tgt=minion.id)
302 -@@ -34,6 +35,7 @@ def test_minion(minion, salt_cli):
303 - assert ret.json is True
304 -
305 -
306 -+@×××××××××××.skip("not compatible with network-sandbox")
307 - def test_no_match(minion, salt_cli):
308 - assert minion.is_running()
309 - ret = salt_cli.run("test.ping", minion_tgt="minion-2")
310 -@@ -41,6 +43,7 @@ def test_no_match(minion, salt_cli):
311 - assert not ret.json
312 -
313 -
314 -+@×××××××××××.skip("not compatible with network-sandbox")
315 - def test_show_jid(minion, salt_cli):
316 - assert minion.is_running()
317 - ret = salt_cli.run("--show-jid", "test.ping", minion_tgt=minion.id)
318 -@@ -48,6 +51,7 @@ def test_show_jid(minion, salt_cli):
319 - assert ret.json is True
320 -
321 -
322 -+@×××××××××××.skip("not compatible with network-sandbox")
323 - def test_minion_salt_call(minion, salt_call_cli):
324 - assert minion.is_running()
325 - ret = salt_call_cli.run("test.ping")
326 -@@ -59,6 +63,7 @@ def test_minion_salt_call(minion, salt_call_cli):
327 - assert ret.json is True
328 -
329 -
330 -+@×××××××××××.skip("not compatible with network-sandbox")
331 - def test_salt_call_exception_handling_doesnt_timeout(minion, salt_call_cli):
332 - ret = salt_call_cli.run(
333 - "test.raise_exception", "OSError", "2", "No such file or directory", "/tmp/foo.txt"
334 -@@ -66,6 +71,7 @@ def test_salt_call_exception_handling_doesnt_timeout(minion, salt_call_cli):
335 - assert ret.exitcode == 1, ret
336 -
337 -
338 -+@×××××××××××.skip("not compatible with sandbox")
339 - def test_state_tree(minion, salt_call_cli):
340 - sls_contents = """
341 - test:
342 -diff --git a/tests/integration/factories/daemons/minion/test_restarts.py b/tests/integration/factories/daemons/minion/test_restarts.py
343 -index ab1f044..4ac417d 100644
344 ---- a/tests/integration/factories/daemons/minion/test_restarts.py
345 -+++ b/tests/integration/factories/daemons/minion/test_restarts.py
346 -@@ -10,6 +10,7 @@ def master(salt_factories):
347 - yield factory
348 -
349 -
350 -+@×××××××××××.skip("not compatible with network-sandbox")
351 - def test_multiple_start_stops(master):
352 - factory = master.salt_minion_daemon(random_string("minion-"))
353 - assert factory.is_running() is False
354 -diff --git a/tests/integration/factories/daemons/proxy/test_proxy_minion.py b/tests/integration/factories/daemons/proxy/test_proxy_minion.py
355 -index 926e6ac..f30c986 100644
356 ---- a/tests/integration/factories/daemons/proxy/test_proxy_minion.py
357 -+++ b/tests/integration/factories/daemons/proxy/test_proxy_minion.py
358 -@@ -35,6 +35,7 @@ def salt_call_cli(proxy_minion):
359 - return proxy_minion.salt_call_cli()
360 -
361 -
362 -+@×××××××××××.skip("not compatible with network-sandbox")
363 - def test_proxy_minion(proxy_minion, salt_cli):
364 - assert proxy_minion.is_running()
365 - ret = salt_cli.run("test.ping", minion_tgt=proxy_minion.id)
366 -@@ -42,6 +43,7 @@ def test_proxy_minion(proxy_minion, salt_cli):
367 - assert ret.json is True
368 -
369 -
370 -+@×××××××××××.skip("not compatible with network-sandbox")
371 - def test_no_match(proxy_minion, salt_cli):
372 - assert proxy_minion.is_running()
373 - ret = salt_cli.run("test.ping", minion_tgt="proxy-minion-2")
374 -@@ -49,6 +51,7 @@ def test_no_match(proxy_minion, salt_cli):
375 - assert not ret.json
376 -
377 -
378 -+@×××××××××××.skip("not compatible with network-sandbox")
379 - def test_show_jid(proxy_minion, salt_cli):
380 - if platform.is_darwin() and sys.version_info[:2] == (3, 7):
381 - pytest.skip(
382 -@@ -61,6 +64,7 @@ def test_show_jid(proxy_minion, salt_cli):
383 - assert ret.json is True
384 -
385 -
386 -+@×××××××××××.skip("not compatible with network-sandbox")
387 - def test_proxy_minion_salt_call(proxy_minion, salt_call_cli):
388 - assert proxy_minion.is_running()
389 - ret = salt_call_cli.run("test.ping")
390 -@@ -72,6 +76,7 @@ def test_proxy_minion_salt_call(proxy_minion, salt_call_cli):
391 - assert ret.json is True
392 -
393 -
394 -+@×××××××××××.skip("not compatible with sandbox")
395 - def test_state_tree(proxy_minion, salt_call_cli):
396 - sls_contents = """
397 - test:
398 -diff --git a/tests/integration/factories/daemons/proxy/test_restarts.py b/tests/integration/factories/daemons/proxy/test_restarts.py
399 -index 22ef97d..c781059 100644
400 ---- a/tests/integration/factories/daemons/proxy/test_restarts.py
401 -+++ b/tests/integration/factories/daemons/proxy/test_restarts.py
402 -@@ -17,6 +17,7 @@ def master(salt_factories):
403 - yield factory
404 -
405 -
406 -+@×××××××××××.skip("not compatible with sandbox")
407 - def test_multiple_start_stops(master):
408 - factory = master.salt_proxy_minion_daemon(random_string("proxy-minion-"))
409 - assert factory.is_running() is False
410 -diff --git a/tests/integration/factories/daemons/ssh/test_salt_ssh.py b/tests/integration/factories/daemons/ssh/test_salt_ssh.py
411 -index e74471a..a288b6b 100644
412 ---- a/tests/integration/factories/daemons/ssh/test_salt_ssh.py
413 -+++ b/tests/integration/factories/daemons/ssh/test_salt_ssh.py
414 -@@ -51,6 +51,7 @@ def salt_ssh_cli(sshd, salt_factories, master):
415 -
416 -
417 - @pytest.mark.skip_on_windows
418 -+@×××××××××××.skip("not compatible with network-sandbox")
419 - def test_salt_ssh(salt_ssh_cli):
420 - ret = salt_ssh_cli.run("--ignore-host-keys", "test.echo", "It Works!", minion_tgt="localhost")
421 - assert ret.exitcode == 0
422 -diff --git a/tests/integration/factories/daemons/sshd/test_sshd.py b/tests/integration/factories/daemons/sshd/test_sshd.py
423 -index 3b425fc..3e03636 100644
424 ---- a/tests/integration/factories/daemons/sshd/test_sshd.py
425 -+++ b/tests/integration/factories/daemons/sshd/test_sshd.py
426 -@@ -5,6 +5,7 @@ import pytest
427 -
428 - @pytest.fixture(scope="module")
429 - @pytest.mark.skip_if_binaries_missing("sshd", "ssh-keygen")
430 -+@×××××××××××.skip("not compatible with network-sandbox")
431 - def sshd(salt_factories):
432 - # Set StrictModes to no because our config directory lives in /tmp and those permissions
433 - # are not acceptable by sshd strict paranoia.
434 -@@ -15,12 +16,14 @@ def sshd(salt_factories):
435 -
436 -
437 - @pytest.mark.skip_on_windows
438 -+@×××××××××××.skip("not compatible with network-sandbox")
439 - def test_sshd(sshd):
440 - assert sshd.is_running()
441 -
442 -
443 - @pytest.mark.skip_on_windows
444 - @pytest.mark.skip_if_binaries_missing("ssh")
445 -+@×××××××××××.skip("not compatible with network-sandbox")
446 - def test_connect(sshd):
447 - cmd = subprocess.run(
448 - [
449 -diff --git a/tests/integration/utils/saltext/test_log_handlers.py b/tests/integration/utils/saltext/test_log_handlers.py
450 -index 96ad66d..118062b 100644
451 ---- a/tests/integration/utils/saltext/test_log_handlers.py
452 -+++ b/tests/integration/utils/saltext/test_log_handlers.py
453 -@@ -24,6 +24,7 @@ def salt_cli(master):
454 - return master.salt_cli()
455 -
456 -
457 -+@×××××××××××.skip("Not compatible with sandbox")
458 - def test_logs_forwarded_from_sub_processes(salt_cli, minion, caplog):
459 - assert minion.is_running()
460 -
461 -diff --git a/tests/scenarios/examples/test_echoext.py b/tests/scenarios/examples/test_echoext.py
462 -index 3d5ce65..5fd503f 100644
463 ---- a/tests/scenarios/examples/test_echoext.py
464 -+++ b/tests/scenarios/examples/test_echoext.py
465 -@@ -1,6 +1,8 @@
466 - from saltfactories import CODE_ROOT_DIR
467 -
468 -+import pytest
469 -
470 -+@×××××××××××.skip("Incompatible with sandbox")
471 - def test_echoext(extension_venv):
472 - extension_path = CODE_ROOT_DIR.parent.parent / "examples" / "echo-extension"
473 - with extension_venv(extension_path) as venv:
474 -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
475 -index 1aa72dc..c4d079e 100644
476 ---- a/tests/unit/utils/markers/test_skip_if_no_remote_network.py
477 -+++ b/tests/unit/utils/markers/test_skip_if_no_remote_network.py
478 -@@ -9,7 +9,10 @@ from unittest import mock
479 - import saltfactories.utils.markers as markers
480 - from saltfactories.utils import socket
481 -
482 -+import pytest
483 -
484 -+
485 -+@×××××××××××.skip("not compatible with network-sandbox")
486 - def test_has_remote_network():
487 - assert markers.skip_if_no_remote_network() is None
488 -
489 -diff --git a/tests/unit/utils/test_platform.py b/tests/unit/utils/test_platform.py
490 -index 28dac0c..b28bcbb 100644
491 ---- a/tests/unit/utils/test_platform.py
492 -+++ b/tests/unit/utils/test_platform.py
493 -@@ -120,6 +120,7 @@ def test_is_not_aix():
494 - assert saltfactories.utils.platform.is_aix() is return_value
495 -
496 -
497 -+@×××××××××××.skip("Doesn't work with salt-3004")
498 - def test_is_aarch64():
499 - return_value = True
500 - with mock.patch("sys.platform", "aarch64"):
501
502 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.911.0.ebuild
503 deleted file mode 100644
504 index 92e0c7b41f95..000000000000
505 --- a/dev-python/pytest-salt-factories/pytest-salt-factories-0.911.0.ebuild
506 +++ /dev/null
507 @@ -1,70 +0,0 @@
508 -# Copyright 2020-2022 Gentoo Authors
509 -# Distributed under the terms of the GNU General Public License v2
510 -
511 -EAPI=8
512 -
513 -PYTHON_COMPAT=( python3_{7..9} )
514 -inherit distutils-r1
515 -
516 -DESCRIPTION="The new generation of the pytest-salt Plugin"
517 -HOMEPAGE="https://github.com/saltstack/pytest-salt-factories"
518 -SRC_URI="https://github.com/saltstack/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
519 -
520 -LICENSE="Apache-2.0"
521 -SLOT="0"
522 -KEYWORDS="amd64 ~arm ~arm64 x86"
523 -IUSE="test"
524 -
525 -RDEPEND="
526 - dev-python/attrs[${PYTHON_USEDEP}]
527 - dev-python/pytest-tempdir[${PYTHON_USEDEP}]
528 - dev-python/psutil[${PYTHON_USEDEP}]
529 - >=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
530 - dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
531 - dev-python/pyzmq[${PYTHON_USEDEP}]
532 - dev-python/msgpack[${PYTHON_USEDEP}]
533 - >=app-admin/salt-3001.0[${PYTHON_USEDEP}]
534 -"
535 -BDEPEND="
536 - ${RDEPEND}
537 - test? (
538 - dev-python/pyfakefs[${PYTHON_USEDEP}]
539 - dev-python/pytest-subtests[${PYTHON_USEDEP}]
540 - )
541 -"
542 -
543 -PATCHES=(
544 - "${FILESDIR}/pytest-salt-factories-0.911.0-tests.patch"
545 -)
546 -
547 -distutils_enable_tests --install pytest
548 -
549 -python_prepare_all() {
550 - sed -r -e "s:use_scm_version=True:version='${PV}', name='${PN//-/.}':" -i setup.py || die
551 - sed -r -e '/(setuptools|setup_requires)/ d' -i setup.cfg || die
552 -
553 - sed -i 's:tool.setuptools_scm:tool.disabled:' pyproject.toml || die
554 - printf '__version__ = "%s"\n' "${PV}" > src/saltfactories/version.py || die
555 - distutils-r1_python_prepare_all
556 -}
557 -
558 -python_test() {
559 - local tempdir
560 -
561 - # ${T} is too long a path for the tests to work
562 - tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
563 - mkdir "${T}/$(basename "${tempdir}")"
564 -
565 - addwrite "${tempdir}"
566 - ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die
567 -
568 - distutils_install_for_testing --via-root
569 -
570 - (
571 - cleanup() { rm -f "${tempdir}" || die; }
572 -
573 - trap cleanup EXIT
574 - env SHELL="/bin/bash" TMPDIR="${tempdir}" \
575 - pytest -vv || die "Tests failed with ${EPYTHON}"
576 - )
577 -}