Merge pull request #58366 from s0undt3ch/hotfix/pytest-migration-1

[PyTest Migration] PyTest Fixes

requirements/pytest.txt

@@ -2,6 +2,6 @@ mock >= 3.0.0
 # PyTest
 pytest >= 6.0.1
 pytest-salt
-pytest-salt-factories >= 0.11.3
+pytest-salt-factories >= 0.11.4
 pytest-tempdir >= 2019.10.12
 pytest-helpers-namespace >= 2019.1.8

requirements/static/py3.5/darwin.txt

@@ -90,7 +90,7 @@ pyopenssl==19.0.0
 pyparsing==2.4.5          # via junos-eznc, packaging
 pyserial==3.4             # via junos-eznc
 pytest-helpers-namespace==2019.1.8
-pytest-salt-factories==0.11.3
+pytest-salt-factories==0.11.4
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
 pytest==6.0.1

requirements/static/py3.5/freebsd.txt

@@ -90,7 +90,7 @@ pyopenssl==19.0.0
 pyparsing==2.4.5          # via junos-eznc, packaging
 pyserial==3.4             # via junos-eznc
 pytest-helpers-namespace==2019.1.8
-pytest-salt-factories==0.11.3
+pytest-salt-factories==0.11.4
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
 pytest==6.0.1

requirements/static/py3.5/linux.txt

@@ -181,7 +181,7 @@ pyopenssl==19.0.0
 pyparsing==2.4.5          # via junos-eznc, packaging
 pyserial==3.4             # via junos-eznc
 pytest-helpers-namespace==2019.1.8
-pytest-salt-factories==0.11.3
+pytest-salt-factories==0.11.4
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
 pytest==6.0.1

requirements/static/py3.5/windows.txt

@@ -83,7 +83,7 @@ pymysql==0.9.3
 pyopenssl==19.0.0
 pyparsing==2.4.5          # via packaging
 pytest-helpers-namespace==2019.1.8
-pytest-salt-factories==0.11.3
+pytest-salt-factories==0.11.4
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
 pytest==6.0.1

requirements/static/py3.6/darwin.txt

@@ -95,7 +95,7 @@ pyopenssl==19.0.0
 pyparsing==2.4.5          # via junos-eznc, packaging
 pyserial==3.4             # via junos-eznc, netmiko
 pytest-helpers-namespace==2019.1.8
-pytest-salt-factories==0.11.3
+pytest-salt-factories==0.11.4
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
 pytest==6.0.1

requirements/static/py3.6/freebsd.txt

@@ -95,7 +95,7 @@ pyopenssl==19.0.0
 pyparsing==2.4.5          # via junos-eznc, packaging
 pyserial==3.4             # via junos-eznc, netmiko
 pytest-helpers-namespace==2019.1.8
-pytest-salt-factories==0.11.3
+pytest-salt-factories==0.11.4
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
 pytest==6.0.1

requirements/static/py3.6/linux.txt

@@ -185,7 +185,7 @@ pyopenssl==19.0.0
 pyparsing==2.4.5          # via junos-eznc, packaging
 pyserial==3.4             # via junos-eznc, netmiko
 pytest-helpers-namespace==2019.1.8
-pytest-salt-factories==0.11.3
+pytest-salt-factories==0.11.4
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
 pytest==6.0.1

requirements/static/py3.6/windows.txt

@@ -82,7 +82,7 @@ pymysql==0.9.3
 pyopenssl==19.0.0
 pyparsing==2.4.5          # via packaging
 pytest-helpers-namespace==2019.1.8
-pytest-salt-factories==0.11.3
+pytest-salt-factories==0.11.4
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
 pytest==6.0.1

requirements/static/py3.7/darwin.txt

@@ -93,7 +93,7 @@ pyopenssl==19.0.0
 pyparsing==2.4.5          # via junos-eznc, packaging
 pyserial==3.4             # via junos-eznc, netmiko
 pytest-helpers-namespace==2019.1.8
-pytest-salt-factories==0.11.3
+pytest-salt-factories==0.11.4
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
 pytest==6.0.1

requirements/static/py3.7/freebsd.txt

@@ -94,7 +94,7 @@ pyopenssl==19.0.0
 pyparsing==2.4.5          # via junos-eznc, packaging
 pyserial==3.4             # via junos-eznc, netmiko
 pytest-helpers-namespace==2019.1.8
-pytest-salt-factories==0.11.3
+pytest-salt-factories==0.11.4
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
 pytest==6.0.1

requirements/static/py3.7/linux.txt

@@ -184,7 +184,7 @@ pyopenssl==19.0.0
 pyparsing==2.4.5          # via junos-eznc, packaging
 pyserial==3.4             # via junos-eznc, netmiko
 pytest-helpers-namespace==2019.1.8
-pytest-salt-factories==0.11.3
+pytest-salt-factories==0.11.4
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
 pytest==6.0.1

requirements/static/py3.7/windows.txt

@@ -80,7 +80,7 @@ pymysql==0.9.3
 pyopenssl==19.0.0
 pyparsing==2.4.5          # via packaging
 pytest-helpers-namespace==2019.1.8
-pytest-salt-factories==0.11.3
+pytest-salt-factories==0.11.4
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
 pytest==6.0.1

requirements/static/py3.8/darwin.txt

@@ -92,7 +92,7 @@ pyopenssl==19.0.0
 pyparsing==2.4.5          # via junos-eznc, packaging
 pyserial==3.4             # via junos-eznc, netmiko
 pytest-helpers-namespace==2019.1.8
-pytest-salt-factories==0.11.3
+pytest-salt-factories==0.11.4
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
 pytest==6.0.1

requirements/static/py3.8/freebsd.txt

@@ -93,7 +93,7 @@ pyopenssl==19.0.0
 pyparsing==2.4.5          # via junos-eznc, packaging
 pyserial==3.4             # via junos-eznc, netmiko
 pytest-helpers-namespace==2019.1.8
-pytest-salt-factories==0.11.3
+pytest-salt-factories==0.11.4
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
 pytest==6.0.1

requirements/static/py3.8/linux.txt

@@ -184,7 +184,7 @@ pyopenssl==19.0.0
 pyparsing==2.4.5          # via junos-eznc, packaging
 pyserial==3.4             # via junos-eznc, netmiko
 pytest-helpers-namespace==2019.1.8
-pytest-salt-factories==0.11.3
+pytest-salt-factories==0.11.4
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
 pytest==6.0.1

requirements/static/py3.9/darwin.txt

@@ -92,7 +92,7 @@ pyopenssl==19.0.0
 pyparsing==2.4.5          # via junos-eznc, packaging
 pyserial==3.4             # via junos-eznc, netmiko
 pytest-helpers-namespace==2019.1.8
-pytest-salt-factories==0.11.3
+pytest-salt-factories==0.11.4
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
 pytest==6.0.1

requirements/static/py3.9/freebsd.txt

@@ -93,7 +93,7 @@ pyopenssl==19.0.0
 pyparsing==2.4.5          # via junos-eznc, packaging
 pyserial==3.4             # via junos-eznc, netmiko
 pytest-helpers-namespace==2019.1.8
-pytest-salt-factories==0.11.3
+pytest-salt-factories==0.11.4
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
 pytest==6.0.1

requirements/static/py3.9/linux.txt

@@ -184,7 +184,7 @@ pyopenssl==19.0.0
 pyparsing==2.4.5          # via junos-eznc, packaging
 pyserial==3.4             # via junos-eznc, netmiko
 pytest-helpers-namespace==2019.1.8
-pytest-salt-factories==0.11.3
+pytest-salt-factories==0.11.4
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
 pytest==6.0.1

tests/pytests/integration/modules/test_virt.py

@@ -73,6 +73,7 @@ def virt_minion_0(
         "root_dir": str(root_dir),
         "id": virt_minion_0_id,
         "open_mode": True,
+        "transport": salt_master.config["transport"],
     }
     config_overrides = {"user": "root"}
     config = SaltVirtMinionContainerFactory.configure(
@@ -122,6 +123,7 @@ def virt_minion_1(
         "root_dir": str(root_dir),
         "id": virt_minion_1_id,
         "open_mode": True,
+        "transport": salt_master.config["transport"],
     }
     config_overrides = {"user": "root"}
     config = SaltVirtMinionContainerFactory.configure(