Fix cloud requirements

.pre-commit-config.yaml

@@ -813,13 +813,14 @@ repos:
       - id: pip-tools-compile
         alias: compile-ci-cloud-py3.5-requirements
         name: Cloud CI Py3.5 Requirements
-        files: ^requirements/((base|zeromq)\.txt|static/(pkg/linux\.in|ci/(cloud\.in|py3\.5/cloud\.txt)))$
+        files: ^requirements/((base|zeromq|pytest)\.txt|static/(pkg/linux\.in|ci/(cloud\.in|py3\.5/cloud\.txt)))$
         pass_filenames: false
         args:
           - -v
           - --py-version=3.5
           - --include=requirements/base.txt
           - --include=requirements/zeromq.txt
+          - --include=requirements/pytest.txt
           - --include=requirements/static/pkg/linux.in
           - --pip-args=--constraint=requirements/static/ci/py{py_version}/linux.txt
           - requirements/static/ci/cloud.in
@@ -827,13 +828,14 @@ repos:
       - id: pip-tools-compile
         alias: compile-ci-cloud-py3.6-requirements
         name: Cloud CI Py3.6 Requirements
-        files: ^requirements/((base|zeromq)\.txt|static/(pkg/linux\.in|ci/(cloud\.in|py3\.6/cloud\.txt)))$
+        files: ^requirements/((base|zeromq|pytest)\.txt|static/(pkg/linux\.in|ci/(cloud\.in|py3\.6/cloud\.txt)))$
         pass_filenames: false
         args:
           - -v
           - --py-version=3.6
           - --include=requirements/base.txt
           - --include=requirements/zeromq.txt
+          - --include=requirements/pytest.txt
           - --include=requirements/static/pkg/linux.in
           - --pip-args=--constraint=requirements/static/pkg/py{py_version}/linux.txt
           - requirements/static/ci/cloud.in
@@ -841,13 +843,14 @@ repos:
       - id: pip-tools-compile
         alias: compile-ci-cloud-py3.7-requirements
         name: Cloud CI Py3.7 Requirements
-        files: ^requirements/((base|zeromq)\.txt|static/(pkg/linux\.in|ci/(cloud\.in|py3\.7/cloud\.txt)))$
+        files: ^requirements/((base|zeromq|pytest)\.txt|static/(pkg/linux\.in|ci/(cloud\.in|py3\.7/cloud\.txt)))$
         pass_filenames: false
         args:
           - -v
           - --py-version=3.7
           - --include=requirements/base.txt
           - --include=requirements/zeromq.txt
+          - --include=requirements/pytest.txt
           - --include=requirements/static/pkg/linux.in
           - --pip-args=--constraint=requirements/static/ci/py{py_version}/linux.txt
           - requirements/static/ci/cloud.in
@@ -855,13 +858,14 @@ repos:
       - id: pip-tools-compile
         alias: compile-ci-cloud-py3.8-requirements
         name: Cloud CI Py3.8 Requirements
-        files: ^requirements/((base|zeromq)\.txt|static/(pkg/linux\.in|ci/(cloud\.in|py3\.8/cloud\.txt)))$
+        files: ^requirements/((base|zeromq|pytest)\.txt|static/(pkg/linux\.in|ci/(cloud\.in|py3\.8/cloud\.txt)))$
         pass_filenames: false
         args:
           - -v
           - --py-version=3.8
           - --include=requirements/base.txt
           - --include=requirements/zeromq.txt
+          - --include=requirements/pytest.txt
           - --include=requirements/static/pkg/linux.in
           - --pip-args=--constraint=requirements/static/ci/py{py_version}/linux.txt
           - requirements/static/ci/cloud.in
@@ -869,13 +873,14 @@ repos:
       - id: pip-tools-compile
         alias: compile-ci-cloud-py3.9-requirements
         name: Cloud CI Py3.9 Requirements
-        files: ^requirements/((base|zeromq)\.txt|static/(pkg/linux\.in|ci/(cloud\.in|py3\.9/cloud\.txt)))$
+        files: ^requirements/((base|zeromq|pytest)\.txt|static/(pkg/linux\.in|ci/(cloud\.in|py3\.9/cloud\.txt)))$
         pass_filenames: false
         args:
           - -v
           - --py-version=3.9
           - --include=requirements/base.txt
           - --include=requirements/zeromq.txt
+          - --include=requirements/pytest.txt
           - --include=requirements/static/pkg/linux.in
           - --pip-args=--constraint=requirements/static/ci/py{py_version}/linux.txt
           - requirements/static/ci/cloud.in
@@ -883,13 +888,14 @@ repos:
       - id: pip-tools-compile
         alias: compile-ci-cloud-py3.10-requirements
         name: Cloud CI Py3.10 Requirements
-        files: ^requirements/((base|zeromq)\.txt|static/(pkg/linux\.in|ci/(cloud\.in|py3\.10/cloud\.txt)))$
+        files: ^requirements/((base|zeromq|pytest)\.txt|static/(pkg/linux\.in|ci/(cloud\.in|py3\.10/cloud\.txt)))$
         pass_filenames: false
         args:
           - -v
           - --py-version=3.10
           - --include=requirements/base.txt
           - --include=requirements/zeromq.txt
+          - --include=requirements/pytest.txt
           - --include=requirements/static/pkg/linux.in
           - --pip-args=--constraint=requirements/static/ci/py{py_version}/linux.txt
           - requirements/static/ci/cloud.in

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

@@ -2,10 +2,16 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile --output-file=requirements/static/ci/py3.10/cloud.txt --pip-args='--constraint=requirements/static/ci/py3.10/linux.txt' requirements/base.txt requirements/static/ci/cloud.in requirements/static/pkg/linux.in requirements/zeromq.txt
+#    pip-compile --output-file=requirements/static/ci/py3.10/cloud.txt --pip-args='--constraint=requirements/static/ci/py3.10/linux.txt' requirements/base.txt requirements/pytest.txt requirements/static/ci/cloud.in requirements/static/pkg/linux.in requirements/zeromq.txt
 #
 apache-libcloud==2.5.0
     # via -r requirements/static/ci/cloud.in
+attrs==21.2.0
+    # via
+    #   pytest
+    #   pytest-salt-factories
+backports.entry-points-selectable==1.1.0
+    # via virtualenv
 certifi==2021.5.30
     # via requests
 cffi==1.14.6
@@ -23,12 +29,20 @@ cryptography==3.3.2
     #   pyopenssl
     #   requests-ntlm
     #   smbprotocol
+distlib==0.3.2
+    # via virtualenv
 distro==1.6.0
     # via -r requirements/base.txt
+filelock==3.0.12
+    # via virtualenv
+flaky==3.7.0
+    # via -r requirements/pytest.txt
 idna==2.8
     # via requests
 immutables==0.16
     # via contextvars
+iniconfig==1.1.1
+    # via pytest
 jaraco.classes==3.2.1
     # via jaraco.collections
 jaraco.collections==3.4.0
@@ -46,6 +60,8 @@ markupsafe==2.0.1
     # via
     #   -r requirements/base.txt
     #   jinja2
+mock==4.0.3
+    # via -r requirements/pytest.txt
 more-itertools==8.8.0
     # via
     #   cheroot
@@ -53,19 +69,31 @@ more-itertools==8.8.0
     #   jaraco.classes
     #   jaraco.functools
 msgpack==1.0.2
-    # via -r requirements/base.txt
+    # via
+    #   -r requirements/base.txt
+    #   pytest-salt-factories
 netaddr==0.7.19
     # via -r requirements/static/ci/cloud.in
 ntlm-auth==1.3.0
     # via
     #   requests-ntlm
     #   smbprotocol
+packaging==21.0
+    # via pytest
+platformdirs==2.3.0
+    # via virtualenv
+pluggy==1.0.0
+    # via pytest
 portend==2.7.1
     # via cherrypy
 profitbricks==4.1.3
     # via -r requirements/static/ci/cloud.in
 psutil==5.8.0
-    # via -r requirements/static/pkg/linux.in
+    # via
+    #   -r requirements/static/pkg/linux.in
+    #   pytest-salt-factories
+py==1.10.0
+    # via pytest
 pyasn1==0.4.5
     # via smbprotocol
 pycparser==2.19
@@ -74,8 +102,29 @@ pycryptodomex==3.10.1
     # via -r requirements/crypto.txt
 pyopenssl==20.0.1
     # via -r requirements/static/pkg/linux.in
+pyparsing==2.4.7
+    # via packaging
 pypsexec==0.1.0
     # via -r requirements/static/ci/cloud.in
+pytest-helpers-namespace==2021.4.29
+    # via
+    #   -r requirements/pytest.txt
+    #   pytest-salt-factories
+pytest-salt-factories==0.911.0
+    # via -r requirements/pytest.txt
+pytest-subtests==0.5.0
+    # via -r requirements/pytest.txt
+pytest-tempdir==2019.10.12
+    # via
+    #   -r requirements/pytest.txt
+    #   pytest-salt-factories
+pytest==6.2.5
+    # via
+    #   -r requirements/pytest.txt
+    #   pytest-helpers-namespace
+    #   pytest-salt-factories
+    #   pytest-subtests
+    #   pytest-tempdir
 python-dateutil==2.8.2
     # via -r requirements/static/pkg/linux.in
 python-gnupg==0.4.7
@@ -87,7 +136,9 @@ pywinrm==0.3.0
 pyyaml==5.4.1
     # via -r requirements/base.txt
 pyzmq==21.0.2 ; python_version >= "3.9"
-    # via -r requirements/zeromq.txt
+    # via
+    #   -r requirements/zeromq.txt
+    #   pytest-salt-factories
 requests-ntlm==1.1.0
     # via pywinrm
 requests==2.25.1
@@ -109,14 +160,19 @@ six==1.16.0
     #   python-dateutil
     #   pywinrm
     #   smbprotocol
+    #   virtualenv
 smbprotocol==0.1.1
     # via pypsexec
 tempora==4.1.1
     # via portend
 timelib==0.2.5
     # via -r requirements/static/pkg/linux.in
+toml==0.10.2
+    # via pytest
 urllib3==1.26.6
     # via requests
+virtualenv==20.8.0
+    # via pytest-salt-factories
 xmltodict==0.12.0
     # via pywinrm
 zc.lockfile==2.0

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

@@ -2,10 +2,16 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile --output-file=requirements/static/ci/py3.5/cloud.txt --pip-args='--constraint=requirements/static/ci/py3.5/linux.txt' requirements/base.txt requirements/static/ci/cloud.in requirements/static/pkg/linux.in requirements/zeromq.txt
+#    pip-compile --output-file=requirements/static/ci/py3.5/cloud.txt --pip-args='--constraint=requirements/static/ci/py3.5/linux.txt' requirements/base.txt requirements/pytest.txt requirements/static/ci/cloud.in requirements/static/pkg/linux.in requirements/zeromq.txt
 #
 apache-libcloud==2.5.0
     # via -r requirements/static/ci/cloud.in
+attrs==21.2.0
+    # via
+    #   pytest
+    #   pytest-salt-factories
+backports.entry-points-selectable==1.1.0
+    # via virtualenv
 backports.ssl-match-hostname==3.7.0.1 ; python_version < "3.7"
     # via -r requirements/static/pkg/linux.in
 certifi==2021.5.30
@@ -25,14 +31,30 @@ cryptography==3.2.1
     #   pyopenssl
     #   requests-ntlm
     #   smbprotocol
+distlib==0.3.3
+    # via virtualenv
 distro==1.6.0
     # via -r requirements/base.txt
+filelock==3.0.12
+    # via virtualenv
+flaky==3.7.0
+    # via -r requirements/pytest.txt
 idna==2.8
     # via requests
 immutables==0.15
     # via contextvars
+importlib-metadata==2.1.1
+    # via
+    #   backports.entry-points-selectable
+    #   pluggy
+    #   pytest
+    #   virtualenv
 importlib-resources==3.2.1
-    # via jaraco.text
+    # via
+    #   jaraco.text
+    #   virtualenv
+iniconfig==1.1.1
+    # via pytest
 jaraco.classes==2.0
     # via jaraco.collections
 jaraco.collections==2.1
@@ -50,25 +72,41 @@ markupsafe==1.1.1
     # via
     #   -r requirements/base.txt
     #   jinja2
+mock==3.0.5
+    # via -r requirements/pytest.txt
 more-itertools==8.8.0
     # via
     #   cheroot
     #   cherrypy
     #   jaraco.functools
 msgpack==1.0.2
-    # via -r requirements/base.txt
+    # via
+    #   -r requirements/base.txt
+    #   pytest-salt-factories
 netaddr==0.7.19
     # via -r requirements/static/ci/cloud.in
 ntlm-auth==1.3.0
     # via
     #   requests-ntlm
     #   smbprotocol
+packaging==20.9
+    # via pytest
+pathlib2==2.3.6
+    # via pytest
+platformdirs==2.0.2
+    # via virtualenv
+pluggy==0.13.1
+    # via pytest
 portend==2.6
     # via cherrypy
 profitbricks==4.1.3
     # via -r requirements/static/ci/cloud.in
 psutil==5.8.0
-    # via -r requirements/static/pkg/linux.in
+    # via
+    #   -r requirements/static/pkg/linux.in
+    #   pytest-salt-factories
+py==1.10.0
+    # via pytest
 pyasn1==0.4.8
     # via smbprotocol
 pycparser==2.19
@@ -77,8 +115,29 @@ pycryptodomex==3.10.1
     # via -r requirements/crypto.txt
 pyopenssl==20.0.1
     # via -r requirements/static/pkg/linux.in
+pyparsing==2.4.7
+    # via packaging
 pypsexec==0.1.0
     # via -r requirements/static/ci/cloud.in
+pytest-helpers-namespace==2021.4.29
+    # via
+    #   -r requirements/pytest.txt
+    #   pytest-salt-factories
+pytest-salt-factories==0.911.0
+    # via -r requirements/pytest.txt
+pytest-subtests==0.5.0
+    # via -r requirements/pytest.txt
+pytest-tempdir==2019.10.12
+    # via
+    #   -r requirements/pytest.txt
+    #   pytest-salt-factories
+pytest==6.1.2
+    # via
+    #   -r requirements/pytest.txt
+    #   pytest-helpers-namespace
+    #   pytest-salt-factories
+    #   pytest-subtests
+    #   pytest-tempdir
 python-dateutil==2.8.2
     # via -r requirements/static/pkg/linux.in
 python-gnupg==0.4.7
@@ -90,7 +149,9 @@ pywinrm==0.3.0
 pyyaml==5.3.1
     # via -r requirements/base.txt
 pyzmq==20.0.0 ; python_version < "3.9"
-    # via -r requirements/zeromq.txt
+    # via
+    #   -r requirements/zeromq.txt
+    #   pytest-salt-factories
 requests-ntlm==1.1.0
     # via pywinrm
 requests==2.25.1
@@ -109,6 +170,8 @@ six==1.16.0
     #   jaraco.classes
     #   jaraco.collections
     #   jaraco.text
+    #   mock
+    #   pathlib2
     #   profitbricks
     #   pyopenssl
     #   pypsexec
@@ -116,20 +179,27 @@ six==1.16.0
     #   pywinrm
     #   smbprotocol
     #   tempora
+    #   virtualenv
 smbprotocol==0.1.1
     # via pypsexec
 tempora==1.14.1
     # via portend
 timelib==0.2.5
     # via -r requirements/static/pkg/linux.in
+toml==0.10.2
+    # via pytest
 urllib3==1.26.6
     # via requests
+virtualenv==20.8.0
+    # via pytest-salt-factories
 xmltodict==0.12.0
     # via pywinrm
 zc.lockfile==2.0
     # via cherrypy
 zipp==1.2.0
-    # via importlib-resources
+    # via
+    #   importlib-metadata
+    #   importlib-resources
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools

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

@@ -2,10 +2,16 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile --output-file=requirements/static/ci/py3.6/cloud.txt --pip-args='--constraint=requirements/static/pkg/py3.6/linux.txt' requirements/base.txt requirements/static/ci/cloud.in requirements/static/pkg/linux.in requirements/zeromq.txt
+#    pip-compile --output-file=requirements/static/ci/py3.6/cloud.txt --pip-args='--constraint=requirements/static/pkg/py3.6/linux.txt' requirements/base.txt requirements/pytest.txt requirements/static/ci/cloud.in requirements/static/pkg/linux.in requirements/zeromq.txt
 #
 apache-libcloud==2.5.0
     # via -r requirements/static/ci/cloud.in
+attrs==21.2.0
+    # via
+    #   pytest
+    #   pytest-salt-factories
+backports.entry-points-selectable==1.1.0
+    # via virtualenv
 backports.ssl-match-hostname==3.7.0.1 ; python_version < "3.7"
     # via -r requirements/static/pkg/linux.in
 certifi==2021.5.30
@@ -25,16 +31,31 @@ cryptography==3.3.2
     #   pyopenssl
     #   requests-ntlm
     #   smbprotocol
+distlib==0.3.3
+    # via virtualenv
 distro==1.6.0
     # via -r requirements/base.txt
+filelock==3.0.12
+    # via virtualenv
+flaky==3.7.0
+    # via -r requirements/pytest.txt
 idna==2.8
     # via requests
 immutables==0.16
     # via contextvars
 importlib-metadata==4.8.1 ; python_version >= "3.6" and python_version < "3.10"
-    # via -r requirements/static/pkg/linux.in
+    # via
+    #   -r requirements/static/pkg/linux.in
+    #   backports.entry-points-selectable
+    #   pluggy
+    #   pytest
+    #   virtualenv
 importlib-resources==5.2.2
-    # via jaraco.text
+    # via
+    #   jaraco.text
+    #   virtualenv
+iniconfig==1.1.1
+    # via pytest
 jaraco.classes==3.2.1
     # via jaraco.collections
 jaraco.collections==3.4.0
@@ -52,6 +73,8 @@ markupsafe==2.0.1
     # via
     #   -r requirements/base.txt
     #   jinja2
+mock==4.0.3
+    # via -r requirements/pytest.txt
 more-itertools==8.8.0
     # via
     #   cheroot
@@ -59,19 +82,31 @@ more-itertools==8.8.0
     #   jaraco.classes
     #   jaraco.functools
 msgpack==1.0.2
-    # via -r requirements/base.txt
+    # via
+    #   -r requirements/base.txt
+    #   pytest-salt-factories
 netaddr==0.7.19
     # via -r requirements/static/ci/cloud.in
 ntlm-auth==1.3.0
     # via
     #   requests-ntlm
     #   smbprotocol
+packaging==21.0
+    # via pytest
+platformdirs==2.3.0
+    # via virtualenv
+pluggy==1.0.0
+    # via pytest
 portend==2.7.1
     # via cherrypy
 profitbricks==4.1.3
     # via -r requirements/static/ci/cloud.in
 psutil==5.8.0
-    # via -r requirements/static/pkg/linux.in
+    # via
+    #   -r requirements/static/pkg/linux.in
+    #   pytest-salt-factories
+py==1.10.0
+    # via pytest
 pyasn1==0.4.8
     # via smbprotocol
 pycparser==2.19
@@ -80,8 +115,29 @@ pycryptodomex==3.10.1
     # via -r requirements/crypto.txt
 pyopenssl==20.0.1
     # via -r requirements/static/pkg/linux.in
+pyparsing==2.4.7
+    # via packaging
 pypsexec==0.1.0
     # via -r requirements/static/ci/cloud.in
+pytest-helpers-namespace==2021.4.29
+    # via
+    #   -r requirements/pytest.txt
+    #   pytest-salt-factories
+pytest-salt-factories==0.911.0
+    # via -r requirements/pytest.txt
+pytest-subtests==0.5.0
+    # via -r requirements/pytest.txt
+pytest-tempdir==2019.10.12
+    # via
+    #   -r requirements/pytest.txt
+    #   pytest-salt-factories
+pytest==6.2.5
+    # via
+    #   -r requirements/pytest.txt
+    #   pytest-helpers-namespace
+    #   pytest-salt-factories
+    #   pytest-subtests
+    #   pytest-tempdir
 python-dateutil==2.8.2
     # via -r requirements/static/pkg/linux.in
 python-gnupg==0.4.7
@@ -93,7 +149,9 @@ pywinrm==0.3.0
 pyyaml==5.4.1
     # via -r requirements/base.txt
 pyzmq==21.0.2 ; python_version < "3.9"
-    # via -r requirements/zeromq.txt
+    # via
+    #   -r requirements/zeromq.txt
+    #   pytest-salt-factories
 requests-ntlm==1.1.0
     # via pywinrm
 requests==2.25.1
@@ -115,18 +173,23 @@ six==1.16.0
     #   python-dateutil
     #   pywinrm
     #   smbprotocol
+    #   virtualenv
 smbprotocol==0.1.1
     # via pypsexec
 tempora==4.1.1
     # via portend
 timelib==0.2.5
     # via -r requirements/static/pkg/linux.in
+toml==0.10.2
+    # via pytest
 typing-extensions==3.10.0.0
     # via
     #   immutables
     #   importlib-metadata
 urllib3==1.26.6
     # via requests
+virtualenv==20.8.0
+    # via pytest-salt-factories
 xmltodict==0.12.0
     # via pywinrm
 zc.lockfile==2.0

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

@@ -2,10 +2,16 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile --output-file=requirements/static/ci/py3.7/cloud.txt --pip-args='--constraint=requirements/static/ci/py3.7/linux.txt' requirements/base.txt requirements/static/ci/cloud.in requirements/static/pkg/linux.in requirements/zeromq.txt
+#    pip-compile --output-file=requirements/static/ci/py3.7/cloud.txt --pip-args='--constraint=requirements/static/ci/py3.7/linux.txt' requirements/base.txt requirements/pytest.txt requirements/static/ci/cloud.in requirements/static/pkg/linux.in requirements/zeromq.txt
 #
 apache-libcloud==2.5.0
     # via -r requirements/static/ci/cloud.in
+attrs==21.2.0
+    # via
+    #   pytest
+    #   pytest-salt-factories
+backports.entry-points-selectable==1.1.0
+    # via virtualenv
 certifi==2021.5.30
     # via requests
 cffi==1.14.6
@@ -23,14 +29,27 @@ cryptography==3.3.2
     #   pyopenssl
     #   requests-ntlm
     #   smbprotocol
+distlib==0.3.3
+    # via virtualenv
 distro==1.6.0
     # via -r requirements/base.txt
+filelock==3.0.12
+    # via virtualenv
+flaky==3.7.0
+    # via -r requirements/pytest.txt
 idna==2.8
     # via requests
 immutables==0.16
     # via contextvars
 importlib-metadata==4.8.1 ; python_version >= "3.6" and python_version < "3.10"
-    # via -r requirements/static/pkg/linux.in
+    # via
+    #   -r requirements/static/pkg/linux.in
+    #   backports.entry-points-selectable
+    #   pluggy
+    #   pytest
+    #   virtualenv
+iniconfig==1.1.1
+    # via pytest
 jaraco.classes==3.2.1
     # via jaraco.collections
 jaraco.collections==3.4.0
@@ -48,6 +67,8 @@ markupsafe==2.0.1
     # via
     #   -r requirements/base.txt
     #   jinja2
+mock==4.0.3
+    # via -r requirements/pytest.txt
 more-itertools==8.8.0
     # via
     #   cheroot
@@ -55,19 +76,31 @@ more-itertools==8.8.0
     #   jaraco.classes
     #   jaraco.functools
 msgpack==1.0.2
-    # via -r requirements/base.txt
+    # via
+    #   -r requirements/base.txt
+    #   pytest-salt-factories
 netaddr==0.7.19
     # via -r requirements/static/ci/cloud.in
 ntlm-auth==1.3.0
     # via
     #   requests-ntlm
     #   smbprotocol
+packaging==21.0
+    # via pytest
+platformdirs==2.3.0
+    # via virtualenv
+pluggy==1.0.0
+    # via pytest
 portend==2.7.1
     # via cherrypy
 profitbricks==4.1.3
     # via -r requirements/static/ci/cloud.in
 psutil==5.8.0
-    # via -r requirements/static/pkg/linux.in
+    # via
+    #   -r requirements/static/pkg/linux.in
+    #   pytest-salt-factories
+py==1.10.0
+    # via pytest
 pyasn1==0.4.8
     # via smbprotocol
 pycparser==2.19
@@ -76,8 +109,29 @@ pycryptodomex==3.10.1
     # via -r requirements/crypto.txt
 pyopenssl==20.0.1
     # via -r requirements/static/pkg/linux.in
+pyparsing==2.4.7
+    # via packaging
 pypsexec==0.1.0
     # via -r requirements/static/ci/cloud.in
+pytest-helpers-namespace==2021.4.29
+    # via
+    #   -r requirements/pytest.txt
+    #   pytest-salt-factories
+pytest-salt-factories==0.911.0
+    # via -r requirements/pytest.txt
+pytest-subtests==0.5.0
+    # via -r requirements/pytest.txt
+pytest-tempdir==2019.10.12
+    # via
+    #   -r requirements/pytest.txt
+    #   pytest-salt-factories
+pytest==6.2.5
+    # via
+    #   -r requirements/pytest.txt
+    #   pytest-helpers-namespace
+    #   pytest-salt-factories
+    #   pytest-subtests
+    #   pytest-tempdir
 python-dateutil==2.8.2
     # via -r requirements/static/pkg/linux.in
 python-gnupg==0.4.7
@@ -89,7 +143,9 @@ pywinrm==0.3.0
 pyyaml==5.4.1
     # via -r requirements/base.txt
 pyzmq==21.0.2 ; python_version < "3.9"
-    # via -r requirements/zeromq.txt
+    # via
+    #   -r requirements/zeromq.txt
+    #   pytest-salt-factories
 requests-ntlm==1.1.0
     # via pywinrm
 requests==2.25.1
@@ -111,18 +167,23 @@ six==1.16.0
     #   python-dateutil
     #   pywinrm
     #   smbprotocol
+    #   virtualenv
 smbprotocol==0.1.1
     # via pypsexec
 tempora==4.1.1
     # via portend
 timelib==0.2.5
     # via -r requirements/static/pkg/linux.in
+toml==0.10.2
+    # via pytest
 typing-extensions==3.10.0.0
     # via
     #   immutables
     #   importlib-metadata
 urllib3==1.26.6
     # via requests
+virtualenv==20.8.0
+    # via pytest-salt-factories
 xmltodict==0.12.0
     # via pywinrm
 zc.lockfile==2.0

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

@@ -2,10 +2,16 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile --output-file=requirements/static/ci/py3.8/cloud.txt --pip-args='--constraint=requirements/static/ci/py3.8/linux.txt' requirements/base.txt requirements/static/ci/cloud.in requirements/static/pkg/linux.in requirements/zeromq.txt
+#    pip-compile --output-file=requirements/static/ci/py3.8/cloud.txt --pip-args='--constraint=requirements/static/ci/py3.8/linux.txt' requirements/base.txt requirements/pytest.txt requirements/static/ci/cloud.in requirements/static/pkg/linux.in requirements/zeromq.txt
 #
 apache-libcloud==2.5.0
     # via -r requirements/static/ci/cloud.in
+attrs==21.2.0
+    # via
+    #   pytest
+    #   pytest-salt-factories
+backports.entry-points-selectable==1.1.0
+    # via virtualenv
 certifi==2021.5.30
     # via requests
 cffi==1.14.6
@@ -23,14 +29,22 @@ cryptography==3.3.2
     #   pyopenssl
     #   requests-ntlm
     #   smbprotocol
+distlib==0.3.3
+    # via virtualenv
 distro==1.6.0
     # via -r requirements/base.txt
+filelock==3.0.12
+    # via virtualenv
+flaky==3.7.0
+    # via -r requirements/pytest.txt
 idna==2.8
     # via requests
 immutables==0.16
     # via contextvars
 importlib-metadata==4.8.1 ; python_version >= "3.6" and python_version < "3.10"
     # via -r requirements/static/pkg/linux.in
+iniconfig==1.1.1
+    # via pytest
 jaraco.classes==3.2.1
     # via jaraco.collections
 jaraco.collections==3.4.0
@@ -48,6 +62,8 @@ markupsafe==2.0.1
     # via
     #   -r requirements/base.txt
     #   jinja2
+mock==4.0.3
+    # via -r requirements/pytest.txt
 more-itertools==8.8.0
     # via
     #   cheroot
@@ -55,19 +71,31 @@ more-itertools==8.8.0
     #   jaraco.classes
     #   jaraco.functools
 msgpack==1.0.2
-    # via -r requirements/base.txt
+    # via
+    #   -r requirements/base.txt
+    #   pytest-salt-factories
 netaddr==0.7.19
     # via -r requirements/static/ci/cloud.in
 ntlm-auth==1.3.0
     # via
     #   requests-ntlm
     #   smbprotocol
+packaging==21.0
+    # via pytest
+platformdirs==2.3.0
+    # via virtualenv
+pluggy==1.0.0
+    # via pytest
 portend==2.7.1
     # via cherrypy
 profitbricks==4.1.3
     # via -r requirements/static/ci/cloud.in
 psutil==5.8.0
-    # via -r requirements/static/pkg/linux.in
+    # via
+    #   -r requirements/static/pkg/linux.in
+    #   pytest-salt-factories
+py==1.10.0
+    # via pytest
 pyasn1==0.4.8
     # via smbprotocol
 pycparser==2.19
@@ -76,8 +104,29 @@ pycryptodomex==3.10.1
     # via -r requirements/crypto.txt
 pyopenssl==20.0.1
     # via -r requirements/static/pkg/linux.in
+pyparsing==2.4.7
+    # via packaging
 pypsexec==0.1.0
     # via -r requirements/static/ci/cloud.in
+pytest-helpers-namespace==2021.4.29
+    # via
+    #   -r requirements/pytest.txt
+    #   pytest-salt-factories
+pytest-salt-factories==0.911.0
+    # via -r requirements/pytest.txt
+pytest-subtests==0.5.0
+    # via -r requirements/pytest.txt
+pytest-tempdir==2019.10.12
+    # via
+    #   -r requirements/pytest.txt
+    #   pytest-salt-factories
+pytest==6.2.5
+    # via
+    #   -r requirements/pytest.txt
+    #   pytest-helpers-namespace
+    #   pytest-salt-factories
+    #   pytest-subtests
+    #   pytest-tempdir
 python-dateutil==2.8.2
     # via -r requirements/static/pkg/linux.in
 python-gnupg==0.4.7
@@ -89,7 +138,9 @@ pywinrm==0.3.0
 pyyaml==5.4.1
     # via -r requirements/base.txt
 pyzmq==21.0.2 ; python_version < "3.9"
-    # via -r requirements/zeromq.txt
+    # via
+    #   -r requirements/zeromq.txt
+    #   pytest-salt-factories
 requests-ntlm==1.1.0
     # via pywinrm
 requests==2.25.1
@@ -111,14 +162,19 @@ six==1.16.0
     #   python-dateutil
     #   pywinrm
     #   smbprotocol
+    #   virtualenv
 smbprotocol==0.1.1
     # via pypsexec
 tempora==4.1.1
     # via portend
 timelib==0.2.5
     # via -r requirements/static/pkg/linux.in
+toml==0.10.2
+    # via pytest
 urllib3==1.26.6
     # via requests
+virtualenv==20.8.0
+    # via pytest-salt-factories
 xmltodict==0.12.0
     # via pywinrm
 zc.lockfile==2.0

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

@@ -2,10 +2,16 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile --output-file=requirements/static/ci/py3.9/cloud.txt --pip-args='--constraint=requirements/static/ci/py3.9/linux.txt' requirements/base.txt requirements/static/ci/cloud.in requirements/static/pkg/linux.in requirements/zeromq.txt
+#    pip-compile --output-file=requirements/static/ci/py3.9/cloud.txt --pip-args='--constraint=requirements/static/ci/py3.9/linux.txt' requirements/base.txt requirements/pytest.txt requirements/static/ci/cloud.in requirements/static/pkg/linux.in requirements/zeromq.txt
 #
 apache-libcloud==2.5.0
     # via -r requirements/static/ci/cloud.in
+attrs==21.2.0
+    # via
+    #   pytest
+    #   pytest-salt-factories
+backports.entry-points-selectable==1.1.0
+    # via virtualenv
 certifi==2021.5.30
     # via requests
 cffi==1.14.6
@@ -23,14 +29,22 @@ cryptography==3.3.2
     #   pyopenssl
     #   requests-ntlm
     #   smbprotocol
+distlib==0.3.3
+    # via virtualenv
 distro==1.6.0
     # via -r requirements/base.txt
+filelock==3.0.12
+    # via virtualenv
+flaky==3.7.0
+    # via -r requirements/pytest.txt
 idna==2.8
     # via requests
 immutables==0.16
     # via contextvars
 importlib-metadata==4.8.1 ; python_version >= "3.6" and python_version < "3.10"
     # via -r requirements/static/pkg/linux.in
+iniconfig==1.1.1
+    # via pytest
 jaraco.classes==3.2.1
     # via jaraco.collections
 jaraco.collections==3.4.0
@@ -48,6 +62,8 @@ markupsafe==2.0.1
     # via
     #   -r requirements/base.txt
     #   jinja2
+mock==4.0.3
+    # via -r requirements/pytest.txt
 more-itertools==8.8.0
     # via
     #   cheroot
@@ -55,19 +71,31 @@ more-itertools==8.8.0
     #   jaraco.classes
     #   jaraco.functools
 msgpack==1.0.2
-    # via -r requirements/base.txt
+    # via
+    #   -r requirements/base.txt
+    #   pytest-salt-factories
 netaddr==0.7.19
     # via -r requirements/static/ci/cloud.in
 ntlm-auth==1.3.0
     # via
     #   requests-ntlm
     #   smbprotocol
+packaging==21.0
+    # via pytest
+platformdirs==2.3.0
+    # via virtualenv
+pluggy==1.0.0
+    # via pytest
 portend==2.7.1
     # via cherrypy
 profitbricks==4.1.3
     # via -r requirements/static/ci/cloud.in
 psutil==5.8.0
-    # via -r requirements/static/pkg/linux.in
+    # via
+    #   -r requirements/static/pkg/linux.in
+    #   pytest-salt-factories
+py==1.10.0
+    # via pytest
 pyasn1==0.4.8
     # via smbprotocol
 pycparser==2.19
@@ -76,8 +104,29 @@ pycryptodomex==3.10.1
     # via -r requirements/crypto.txt
 pyopenssl==20.0.1
     # via -r requirements/static/pkg/linux.in
+pyparsing==2.4.7
+    # via packaging
 pypsexec==0.1.0
     # via -r requirements/static/ci/cloud.in
+pytest-helpers-namespace==2021.4.29
+    # via
+    #   -r requirements/pytest.txt
+    #   pytest-salt-factories
+pytest-salt-factories==0.911.0
+    # via -r requirements/pytest.txt
+pytest-subtests==0.5.0
+    # via -r requirements/pytest.txt
+pytest-tempdir==2019.10.12
+    # via
+    #   -r requirements/pytest.txt
+    #   pytest-salt-factories
+pytest==6.2.5
+    # via
+    #   -r requirements/pytest.txt
+    #   pytest-helpers-namespace
+    #   pytest-salt-factories
+    #   pytest-subtests
+    #   pytest-tempdir
 python-dateutil==2.8.2
     # via -r requirements/static/pkg/linux.in
 python-gnupg==0.4.7
@@ -89,7 +138,9 @@ pywinrm==0.3.0
 pyyaml==5.4.1
     # via -r requirements/base.txt
 pyzmq==21.0.2 ; python_version >= "3.9"
-    # via -r requirements/zeromq.txt
+    # via
+    #   -r requirements/zeromq.txt
+    #   pytest-salt-factories
 requests-ntlm==1.1.0
     # via pywinrm
 requests==2.25.1
@@ -111,14 +162,19 @@ six==1.16.0
     #   python-dateutil
     #   pywinrm
     #   smbprotocol
+    #   virtualenv
 smbprotocol==0.1.1
     # via pypsexec
 tempora==4.1.1
     # via portend
 timelib==0.2.5
     # via -r requirements/static/pkg/linux.in
+toml==0.10.2
+    # via pytest
 urllib3==1.26.6
     # via requests
+virtualenv==20.8.0
+    # via pytest-salt-factories
 xmltodict==0.12.0
     # via pywinrm
 zc.lockfile==2.0