Bump to pytest-salt-factories 0.906.x

requirements/pytest.txt

@@ -1,7 +1,7 @@
 mock >= 3.0.0
 # PyTest
 pytest >= 6.1.0
-pytest-salt-factories >= 0.903.2
+pytest-salt-factories >= 0.906.0
 pytest-tempdir >= 2019.10.12
 pytest-helpers-namespace >= 2019.1.8
 pytest-subtests

requirements/static/ci/py3.10/darwin.txt

@@ -725,7 +725,7 @@ pytest-helpers-namespace==2021.4.29
     # via
     #   -r requirements/pytest.txt
     #   pytest-salt-factories
-pytest-salt-factories==0.903.2
+pytest-salt-factories==0.906.0
     # via -r requirements/pytest.txt
 pytest-subtests==0.4.0
     # via -r requirements/pytest.txt

requirements/static/ci/py3.10/freebsd.txt

@@ -724,7 +724,7 @@ pytest-helpers-namespace==2021.4.29
     # via
     #   -r requirements/pytest.txt
     #   pytest-salt-factories
-pytest-salt-factories==0.903.2
+pytest-salt-factories==0.906.0
     # via -r requirements/pytest.txt
 pytest-subtests==0.4.0
     # via -r requirements/pytest.txt

requirements/static/ci/py3.10/linux.txt

@@ -741,7 +741,7 @@ pytest-helpers-namespace==2021.4.29
     # via
     #   -r requirements/pytest.txt
     #   pytest-salt-factories
-pytest-salt-factories==0.903.2
+pytest-salt-factories==0.906.0
     # via -r requirements/pytest.txt
 pytest-subtests==0.4.0
     # via -r requirements/pytest.txt

requirements/static/ci/py3.5/linux.txt

@@ -729,7 +729,7 @@ pytest-helpers-namespace==2021.4.29
     # via
     #   -r requirements/pytest.txt
     #   pytest-salt-factories
-pytest-salt-factories==0.903.2
+pytest-salt-factories==0.906.0
     # via -r requirements/pytest.txt
 pytest-subtests==0.4.0
     # via -r requirements/pytest.txt

requirements/static/ci/py3.6/linux.txt

@@ -727,7 +727,7 @@ pytest-helpers-namespace==2021.4.29
     # via
     #   -r requirements/pytest.txt
     #   pytest-salt-factories
-pytest-salt-factories==0.903.2
+pytest-salt-factories==0.906.0
     # via -r requirements/pytest.txt
 pytest-subtests==0.4.0
     # via -r requirements/pytest.txt

requirements/static/ci/py3.7/darwin.txt

@@ -733,7 +733,7 @@ pytest-helpers-namespace==2021.4.29
     # via
     #   -r requirements/pytest.txt
     #   pytest-salt-factories
-pytest-salt-factories==0.903.2
+pytest-salt-factories==0.906.0
     # via -r requirements/pytest.txt
 pytest-subtests==0.4.0
     # via -r requirements/pytest.txt

requirements/static/ci/py3.7/freebsd.txt

@@ -732,7 +732,7 @@ pytest-helpers-namespace==2021.4.29
     # via
     #   -r requirements/pytest.txt
     #   pytest-salt-factories
-pytest-salt-factories==0.903.2
+pytest-salt-factories==0.906.0
     # via -r requirements/pytest.txt
 pytest-subtests==0.4.0
     # via -r requirements/pytest.txt

requirements/static/ci/py3.7/linux.txt

@@ -747,7 +747,7 @@ pytest-helpers-namespace==2021.4.29
     # via
     #   -r requirements/pytest.txt
     #   pytest-salt-factories
-pytest-salt-factories==0.903.2
+pytest-salt-factories==0.906.0
     # via -r requirements/pytest.txt
 pytest-subtests==0.4.0
     # via -r requirements/pytest.txt

requirements/static/ci/py3.7/windows.txt

@@ -280,7 +280,7 @@ pytest-helpers-namespace==2021.4.29
     # via
     #   -r requirements/pytest.txt
     #   pytest-salt-factories
-pytest-salt-factories==0.903.2
+pytest-salt-factories==0.906.0
     # via -r requirements/pytest.txt
 pytest-subtests==0.4.0
     # via -r requirements/pytest.txt

requirements/static/ci/py3.8/darwin.txt

@@ -725,7 +725,7 @@ pytest-helpers-namespace==2021.4.29
     # via
     #   -r requirements/pytest.txt
     #   pytest-salt-factories
-pytest-salt-factories==0.903.2
+pytest-salt-factories==0.906.0
     # via -r requirements/pytest.txt
 pytest-subtests==0.4.0
     # via -r requirements/pytest.txt

requirements/static/ci/py3.8/freebsd.txt

@@ -724,7 +724,7 @@ pytest-helpers-namespace==2021.4.29
     # via
     #   -r requirements/pytest.txt
     #   pytest-salt-factories
-pytest-salt-factories==0.903.2
+pytest-salt-factories==0.906.0
     # via -r requirements/pytest.txt
 pytest-subtests==0.4.0
     # via -r requirements/pytest.txt

requirements/static/ci/py3.8/linux.txt

@@ -739,7 +739,7 @@ pytest-helpers-namespace==2021.4.29
     # via
     #   -r requirements/pytest.txt
     #   pytest-salt-factories
-pytest-salt-factories==0.903.2
+pytest-salt-factories==0.906.0
     # via -r requirements/pytest.txt
 pytest-subtests==0.4.0
     # via -r requirements/pytest.txt

requirements/static/ci/py3.9/darwin.txt

@@ -725,7 +725,7 @@ pytest-helpers-namespace==2021.4.29
     # via
     #   -r requirements/pytest.txt
     #   pytest-salt-factories
-pytest-salt-factories==0.903.2
+pytest-salt-factories==0.906.0
     # via -r requirements/pytest.txt
 pytest-subtests==0.4.0
     # via -r requirements/pytest.txt

requirements/static/ci/py3.9/freebsd.txt

@@ -724,7 +724,7 @@ pytest-helpers-namespace==2021.4.29
     # via
     #   -r requirements/pytest.txt
     #   pytest-salt-factories
-pytest-salt-factories==0.903.2
+pytest-salt-factories==0.906.0
     # via -r requirements/pytest.txt
 pytest-subtests==0.4.0
     # via -r requirements/pytest.txt

requirements/static/ci/py3.9/linux.txt

@@ -741,7 +741,7 @@ pytest-helpers-namespace==2021.4.29
     # via
     #   -r requirements/pytest.txt
     #   pytest-salt-factories
-pytest-salt-factories==0.903.2
+pytest-salt-factories==0.906.0
     # via -r requirements/pytest.txt
 pytest-subtests==0.4.0
     # via -r requirements/pytest.txt

tests/conftest.py

@@ -1037,7 +1037,7 @@ def salt_proxy_factory(salt_factories, salt_master_factory):
 
 @pytest.fixture(scope="session")
 def salt_cli(salt_master_factory):
-    return salt_master_factory.get_salt_cli()
+    return salt_master_factory.salt_cli()
 
 
 @pytest.fixture(scope="session")

tests/pytests/integration/conftest.py

@@ -61,7 +61,7 @@ def salt_cli(salt_master):
     The ``salt`` CLI as a fixture against the running master
     """
     assert salt_master.is_running()
-    return salt_master.get_salt_cli()
+    return salt_master.salt_cli()
 
 
 @pytest.fixture(scope="package")

tests/pytests/integration/modules/test_pillar.py

@@ -189,7 +189,7 @@ class PillarRefresh:
     minion_1_pillar = attr.ib(init=False, default=None)
 
     def refresh_pillar(self, timeout=60):
-        ret = self.master.get_salt_cli().run(
+        ret = self.master.salt_cli().run(
             "saltutil.refresh_pillar",
             wait=True,
             minion_tgt=self.minion_id,

tests/pytests/integration/modules/test_virt.py

@@ -153,7 +153,7 @@ def virt_minion_1(
 
 @pytest.fixture(scope="module")
 def salt_cli(salt_master, virt_minion_0, virt_minion_1):
-    return salt_master.get_salt_cli()
+    return salt_master.salt_cli()
 
 
 @pytest.mark.slow_test

tests/pytests/scenarios/blackout/conftest.py

@@ -155,7 +155,7 @@ def salt_minion_2(salt_master):
 
 @pytest.fixture(scope="package")
 def salt_cli(salt_master):
-    return salt_master.get_salt_cli()
+    return salt_master.salt_cli()
 
 
 @pytest.fixture(scope="package")

tests/pytests/scenarios/compat/conftest.py

@@ -153,7 +153,7 @@ def salt_master(
 
 @pytest.fixture
 def salt_cli(salt_master):
-    return salt_master.get_salt_cli()
+    return salt_master.salt_cli()
 
 
 @pytest.fixture

tests/pytests/scenarios/multimaster/conftest.py

@@ -37,7 +37,7 @@ def salt_mm_master_1(request, salt_factories):
 
 @pytest.fixture(scope="package")
 def mm_master_1_salt_cli(salt_mm_master_1):
-    return salt_mm_master_1.get_salt_cli(timeout=120)
+    return salt_mm_master_1.salt_cli(timeout=120)
 
 
 @pytest.fixture(scope="package")
@@ -79,7 +79,7 @@ def salt_mm_master_2(salt_factories, salt_mm_master_1):
 
 @pytest.fixture(scope="package")
 def mm_master_2_salt_cli(salt_mm_master_2):
-    return salt_mm_master_2.get_salt_cli(timeout=120)
+    return salt_mm_master_2.salt_cli(timeout=120)
 
 
 @pytest.fixture(scope="package")

tests/pytests/scenarios/multimaster/test_offline_master.py

@@ -54,7 +54,7 @@ def test_minion_hangs_on_master_failure_50814(
     # Wait for the minion to re-connect so this test will not affect any
     # others.
     salt_mm_master_1.after_start(
-        wait_for_minion, salt_mm_master_1.get_salt_cli(), salt_mm_minion_1.id
+        wait_for_minion, salt_mm_master_1.salt_cli(), salt_mm_minion_1.id
     )
 
     # Now, let's try this one of the masters offline