Upgrade to PyTest 5.x

noxfile.py

@@ -607,7 +607,7 @@ def pytest_parametrized(session, coverage, transport, crypto):
         REPO_ROOT,
         "--log-file={}".format(RUNTESTS_LOGFILE),
         "--log-file-level=debug",
-        "--no-print-logs",
+        "--show-capture=no",
         "-ra",
         "-s",
         "--transport={}".format(transport),
@@ -749,7 +749,7 @@ def pytest_cloud(session, coverage):
         REPO_ROOT,
         "--log-file={}".format(RUNTESTS_LOGFILE),
         "--log-file-level=debug",
-        "--no-print-logs",
+        "--show-capture=no",
         "-ra",
         "-s",
         "--run-expensive",
@@ -772,7 +772,7 @@ def pytest_tornado(session, coverage):
         REPO_ROOT,
         "--log-file={}".format(RUNTESTS_LOGFILE),
         "--log-file-level=debug",
-        "--no-print-logs",
+        "--show-capture=no",
         "-ra",
         "-s",
     ] + session.posargs

pytest.ini

@@ -1,5 +1,4 @@
 [pytest]
-log_print=false
 log_date_format=%H:%M:%S
 log_cli_format=%(asctime)s,%(msecs)03.0f [%(name)-5s:%(lineno)-4d][%(levelname)-8s][%(processName)s(%(process)s)] %(message)s
 log_file_format=%(asctime)s,%(msecs)03d [%(name)-17s:%(lineno)-4d][%(levelname)-8s][%(processName)s(%(process)d)] %(message)s
@@ -8,3 +7,4 @@ testpaths=tests
 python_files=test_*.py
 python_classes=Test*
 python_functions = test_*
+junit_family=xunit2

requirements/pytest.txt

@@ -1,6 +1,8 @@
 mock >= 3.0.0
 # PyTest
-pytest >=4.6.9,<4.7   # PyTest 4.6.x are the last Py2 and Py3 releases
+pytest >= 5.4.2; sys_platform != "win32"
+# https://github.com/pytest-dev/pytest/issues/6964#issuecomment-632727439
+pytest >=4.6.9,<4.7; sys_platform == "win32"
 pytest-salt
 pytest-salt-factories >= 0.10.5
 pytest-tempdir >= 2019.10.12

requirements/static/py3.5/darwin.txt

@@ -8,7 +8,6 @@ apache-libcloud==2.4.0
 appdirs==1.4.3            # via virtualenv
 argh==0.26.2              # via watchdog
 asn1crypto==1.3.0         # via certvalidator, cryptography, oscrypto
-atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
 backports.functools-lru-cache==1.5  # via cheroot
@@ -95,7 +94,7 @@ pytest-salt-factories==0.10.5
 pytest-salt-runtests-bridge==2019.12.5
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
-pytest==4.6.9
+pytest==5.4.2 ; sys_platform != "win32"
 python-dateutil==2.8.0
 python-etcd==0.4.5
 python-gnupg==0.4.4
@@ -112,7 +111,7 @@ s3transfer==0.3.3         # via boto3
 salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
-six==1.12.0               # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, packaging, pathlib2, pynacl, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
+six==1.12.0               # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, packaging, pathlib2, pynacl, pyopenssl, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend

requirements/static/py3.5/linux.txt

@@ -9,7 +9,6 @@ apache-libcloud==2.0.0
 appdirs==1.4.4            # via virtualenv
 argh==0.26.2              # via watchdog
 asn1crypto==1.3.0         # via certvalidator, cryptography, oscrypto
-atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
 azure-applicationinsights==0.1.0  # via azure
@@ -185,7 +184,7 @@ pytest-salt-factories==0.10.5
 pytest-salt-runtests-bridge==2019.12.5
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
-pytest==4.6.9
+pytest==5.4.2 ; sys_platform != "win32"
 python-dateutil==2.8.0    # via adal, azure-cosmosdb-table, azure-storage-common, botocore, croniter, kubernetes, moto, vcert
 python-etcd==0.4.5
 python-gnupg==0.4.4
@@ -204,7 +203,7 @@ salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
 setuptools-scm==3.2.0
-six==1.12.0               # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, isodate, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, packaging, pathlib2, pygit2, pynacl, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
+six==1.12.0               # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, isodate, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, packaging, pathlib2, pygit2, pynacl, pyopenssl, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend

requirements/static/py3.5/windows.txt

@@ -89,7 +89,7 @@ pytest-salt-factories==0.10.5
 pytest-salt-runtests-bridge==2019.12.5
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
-pytest==4.6.9
+pytest==4.6.9 ; sys_platform == "win32"
 python-dateutil==2.8.0
 python-etcd==0.4.5
 python-gnupg==0.4.4

requirements/static/py3.6/darwin.txt

@@ -8,7 +8,6 @@ apache-libcloud==2.4.0
 appdirs==1.4.3            # via virtualenv
 argh==0.26.2              # via watchdog
 asn1crypto==1.3.0         # via certvalidator, cryptography, oscrypto
-atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
 backports.functools-lru-cache==1.5  # via cheroot
@@ -94,7 +93,7 @@ pytest-salt-factories==0.10.5
 pytest-salt-runtests-bridge==2019.12.5
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
-pytest==4.6.9
+pytest==5.4.2 ; sys_platform != "win32"
 python-dateutil==2.8.0
 python-etcd==0.4.5
 python-gnupg==0.4.4
@@ -111,7 +110,7 @@ s3transfer==0.3.3         # via boto3
 salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
-six==1.12.0               # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, packaging, pynacl, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
+six==1.12.0               # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, packaging, pynacl, pyopenssl, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend

requirements/static/py3.6/linux.txt

@@ -9,7 +9,6 @@ apache-libcloud==2.0.0
 appdirs==1.4.4            # via virtualenv
 argh==0.26.2              # via watchdog
 asn1crypto==1.3.0         # via certvalidator, cryptography, oscrypto
-atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
 azure-applicationinsights==0.1.0  # via azure
@@ -184,7 +183,7 @@ pytest-salt-factories==0.10.5
 pytest-salt-runtests-bridge==2019.12.5
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
-pytest==4.6.9
+pytest==5.4.2 ; sys_platform != "win32"
 python-dateutil==2.8.0    # via adal, azure-cosmosdb-table, azure-storage-common, botocore, croniter, kubernetes, moto, vcert
 python-etcd==0.4.5
 python-gnupg==0.4.4
@@ -203,7 +202,7 @@ salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
 setuptools-scm==3.2.0
-six==1.12.0               # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, isodate, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, packaging, pygit2, pynacl, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
+six==1.12.0               # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, isodate, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, packaging, pygit2, pynacl, pyopenssl, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend

requirements/static/py3.6/windows.txt

@@ -88,7 +88,7 @@ pytest-salt-factories==0.10.5
 pytest-salt-runtests-bridge==2019.12.5
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
-pytest==4.6.9
+pytest==4.6.9 ; sys_platform == "win32"
 python-dateutil==2.8.0
 python-etcd==0.4.5
 python-gnupg==0.4.4

requirements/static/py3.7/darwin.txt

@@ -8,7 +8,6 @@ apache-libcloud==2.4.0
 appdirs==1.4.3            # via virtualenv
 argh==0.26.2              # via watchdog
 asn1crypto==1.3.0         # via certvalidator, cryptography, oscrypto
-atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
 backports.functools-lru-cache==1.5  # via cheroot
@@ -93,7 +92,7 @@ pytest-salt-factories==0.10.5
 pytest-salt-runtests-bridge==2019.12.5
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
-pytest==4.6.9
+pytest==5.4.2 ; sys_platform != "win32"
 python-dateutil==2.8.0
 python-etcd==0.4.5
 python-gnupg==0.4.4
@@ -110,7 +109,7 @@ s3transfer==0.3.3         # via boto3
 salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
-six==1.12.0               # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, packaging, pynacl, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
+six==1.12.0               # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, packaging, pynacl, pyopenssl, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend

requirements/static/py3.7/linux.txt

@@ -9,7 +9,6 @@ apache-libcloud==2.0.0
 appdirs==1.4.4            # via virtualenv
 argh==0.26.2              # via watchdog
 asn1crypto==1.3.0         # via certvalidator, cryptography, oscrypto
-atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
 azure-applicationinsights==0.1.0  # via azure
@@ -183,7 +182,7 @@ pytest-salt-factories==0.10.5
 pytest-salt-runtests-bridge==2019.12.5
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
-pytest==4.6.9
+pytest==5.4.2 ; sys_platform != "win32"
 python-dateutil==2.8.0    # via adal, azure-cosmosdb-table, azure-storage-common, botocore, croniter, kubernetes, moto, vcert
 python-etcd==0.4.5
 python-gnupg==0.4.4
@@ -202,7 +201,7 @@ salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
 setuptools-scm==3.2.0
-six==1.12.0               # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, isodate, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, packaging, pygit2, pynacl, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
+six==1.12.0               # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, isodate, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, packaging, pygit2, pynacl, pyopenssl, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend

requirements/static/py3.7/windows.txt

@@ -86,7 +86,7 @@ pytest-salt-factories==0.10.5
 pytest-salt-runtests-bridge==2019.12.5
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
-pytest==4.6.9
+pytest==4.6.9 ; sys_platform == "win32"
 python-dateutil==2.8.0
 python-etcd==0.4.5
 python-gnupg==0.4.4

requirements/static/py3.8/darwin.txt

@@ -8,7 +8,6 @@ apache-libcloud==2.4.0
 appdirs==1.4.3            # via virtualenv
 argh==0.26.2              # via watchdog
 asn1crypto==1.3.0         # via certvalidator, cryptography, oscrypto
-atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
 backports.functools-lru-cache==1.5  # via cheroot
@@ -92,7 +91,7 @@ pytest-salt-factories==0.10.5
 pytest-salt-runtests-bridge==2019.12.5
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
-pytest==4.6.9
+pytest==5.4.2 ; sys_platform != "win32"
 python-dateutil==2.8.0
 python-etcd==0.4.5
 python-gnupg==0.4.4
@@ -109,7 +108,7 @@ s3transfer==0.3.3         # via boto3
 salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
-six==1.12.0               # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, packaging, pynacl, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
+six==1.12.0               # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, packaging, pynacl, pyopenssl, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend

requirements/static/py3.8/linux.txt

@@ -9,7 +9,6 @@ apache-libcloud==2.0.0
 appdirs==1.4.4            # via virtualenv
 argh==0.26.2              # via watchdog
 asn1crypto==1.3.0         # via certvalidator, cryptography, oscrypto
-atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
 azure-applicationinsights==0.1.0  # via azure
@@ -183,7 +182,7 @@ pytest-salt-factories==0.10.5
 pytest-salt-runtests-bridge==2019.12.5
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
-pytest==4.6.9
+pytest==5.4.2 ; sys_platform != "win32"
 python-dateutil==2.8.0    # via adal, azure-cosmosdb-table, azure-storage-common, botocore, croniter, kubernetes, moto, vcert
 python-etcd==0.4.5
 python-gnupg==0.4.4
@@ -202,7 +201,7 @@ salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
 setuptools-scm==3.2.0
-six==1.12.0               # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, isodate, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, packaging, pynacl, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
+six==1.12.0               # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, isodate, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, packaging, pynacl, pyopenssl, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend

requirements/static/py3.9/darwin.txt

@@ -8,7 +8,6 @@ apache-libcloud==2.4.0
 appdirs==1.4.3            # via virtualenv
 argh==0.26.2              # via watchdog
 asn1crypto==1.3.0         # via certvalidator, cryptography, oscrypto
-atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
 backports.functools-lru-cache==1.5  # via cheroot
@@ -92,7 +91,7 @@ pytest-salt-factories==0.10.5
 pytest-salt-runtests-bridge==2019.12.5
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
-pytest==4.6.9
+pytest==5.4.2 ; sys_platform != "win32"
 python-dateutil==2.8.0
 python-etcd==0.4.5
 python-gnupg==0.4.4
@@ -109,7 +108,7 @@ s3transfer==0.3.3         # via boto3
 salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
-six==1.12.0               # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, packaging, pynacl, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
+six==1.12.0               # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, packaging, pynacl, pyopenssl, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
 smmap2==3.0.1             # via gitdb2
 smmap==3.0.4              # via smmap2
 strict-rfc3339==0.7

requirements/static/py3.9/linux.txt

@@ -9,7 +9,6 @@ apache-libcloud==2.0.0
 appdirs==1.4.4            # via virtualenv
 argh==0.26.2              # via watchdog
 asn1crypto==1.3.0         # via certvalidator, cryptography, oscrypto
-atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
 aws-xray-sdk==0.95        # via moto
 azure-applicationinsights==0.1.0  # via azure
@@ -183,7 +182,7 @@ pytest-salt-factories==0.10.5
 pytest-salt-runtests-bridge==2019.12.5
 pytest-salt==2020.1.27
 pytest-tempdir==2019.10.12
-pytest==4.6.9
+pytest==5.4.2 ; sys_platform != "win32"
 python-dateutil==2.8.0    # via adal, azure-cosmosdb-table, azure-storage-common, botocore, croniter, kubernetes, moto, vcert
 python-etcd==0.4.5
 python-gnupg==0.4.4
@@ -202,7 +201,7 @@ salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
 setuptools-scm==3.2.0
-six==1.12.0               # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, isodate, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, packaging, pynacl, pyopenssl, pytest, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
+six==1.12.0               # via bcrypt, cassandra-driver, cheroot, cherrypy, cryptography, docker, docker-pycreds, geomet, google-auth, isodate, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, packaging, pynacl, pyopenssl, pytest-salt-factories, python-dateutil, python-jose, pyvmomi, responses, salttesting, tempora, textfsm, transitions, vcert, virtualenv, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend