Merge pull request #55464 from s0undt3ch/features/pytest-staged-2

[PyTest #2] Name the processes.

requirements/pytest.txt

@@ -1,8 +1,6 @@
 # PyTest
-pytest >= 4.0.1
-pytest-cov
-pytest-salt == 2018.12.8
-pytest-timeout >= 1.3.3
-pytest-tempdir >= 2018.8.11
-pytest-helpers-namespace >= 2017.11.11
-pytest-salt-runtests-bridge >= 2019.1.30
+pytest >=4.6.6,<4.7   # PyTest 4.6.x are the last Py2 and Py3 releases
+pytest-salt >= 2019.11.27
+pytest-tempdir >= 2019.10.12
+pytest-helpers-namespace >= 2019.1.8
+pytest-salt-runtests-bridge >= 2019.7.10

requirements/static/py2.7/darwin.txt

@@ -27,9 +27,9 @@ cheroot==6.5.5            # via cherrypy
 cherrypy==17.4.1
 click==7.0
 clustershell==1.8.1
-contextlib2==0.5.5        # via cherrypy
+configparser==4.0.2       # via importlib-metadata
+contextlib2==0.5.5        # via cherrypy, importlib-metadata
 cookies==2.2.1            # via responses
-coverage==4.5.3           # via pytest-cov
 croniter==0.3.29
 cryptography==2.6.1
 dnspython==1.16.0
@@ -47,6 +47,7 @@ gitdb==0.6.4
 gitpython==2.1.11
 google-auth==1.6.3        # via kubernetes
 idna==2.8
+importlib-metadata==0.23  # via pluggy, pytest
 ipaddress==1.0.22
 jaraco.functools==2.0     # via tempora
 jinja2==2.10.1
@@ -70,10 +71,11 @@ msgpack-python==0.5.6
 msgpack==0.5.6
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
+packaging==19.2           # via pytest
 paramiko==2.4.2           # via junos-eznc, ncclient, scp
-pathlib2==2.3.3           # via pytest
+pathlib2==2.3.3           # via importlib-metadata, pytest
 pathtools==0.1.2          # via watchdog
-pluggy==0.9.0             # via pytest
+pluggy==0.13.1            # via pytest
 portend==2.4              # via cherrypy
 psutil==5.6.1
 py==1.8.0                 # via pytest
@@ -86,14 +88,13 @@ pycparser==2.19
 pycryptodome==3.8.1
 pynacl==1.3.0             # via paramiko
 pyopenssl==19.0.0
+pyparsing==2.4.5          # via packaging
 pyserial==3.4             # via junos-eznc
-pytest-cov==2.6.1
 pytest-helpers-namespace==2019.1.8
-pytest-salt-runtests-bridge==2019.1.30
-pytest-salt==2018.12.8
-pytest-tempdir==2018.8.11
-pytest-timeout==1.3.3
-pytest==4.4.1
+pytest-salt-runtests-bridge==2019.7.10
+pytest-salt==2019.11.27
+pytest-tempdir==2019.10.12
+pytest==4.6.6
 python-dateutil==2.8.0
 python-etcd==0.4.5
 python-gnupg==0.4.4
@@ -113,7 +114,7 @@ scp==0.13.2               # via junos-eznc
 selectors2==2.0.1         # via ncclient
 setproctitle==1.1.10
 singledispatch==3.4.0.3
-six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
+six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, packaging, pathlib2, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 smmap==0.9.0
 strict-rfc3339==0.7
@@ -125,11 +126,13 @@ urllib3==1.24.2           # via botocore, kubernetes, python-etcd, requests
 virtualenv==16.4.3
 vultr==1.0.1
 watchdog==0.9.0
+wcwidth==0.1.7            # via pytest
 websocket-client==0.40.0  # via docker, kubernetes
 werkzeug==0.15.6          # via moto
 wrapt==1.11.1             # via aws-xray-sdk
 xmltodict==0.12.0         # via moto
 yamlordereddictloader==0.4.0
 zc.lockfile==1.4          # via cherrypy
+zipp==0.6.0               # via importlib-metadata
 # Passthrough dependencies from pkg/osx/req.txt
 pyobjc==5.1.2

requirements/static/py2.7/linux.txt

@@ -25,9 +25,9 @@ cffi==1.12.2
 chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
 cherrypy==17.3.0
-contextlib2==0.5.5        # via cherrypy
+configparser==4.0.2       # via importlib-metadata
+contextlib2==0.5.5        # via cherrypy, importlib-metadata
 cookies==2.2.1            # via responses
-coverage==4.5.3           # via pytest-cov
 croniter==0.3.29
 cryptography==2.6.1       # via moto, paramiko, pyopenssl
 dnspython==1.16.0
@@ -45,6 +45,7 @@ gitpython==2.1.11
 google-auth==1.6.3        # via kubernetes
 hgtools==8.1.1
 idna==2.8                 # via requests
+importlib-metadata==0.23  # via pluggy, pytest
 ipaddress==1.0.22         # via cryptography, docker, kubernetes
 jaraco.functools==2.0     # via tempora
 jinja2==2.10.1
@@ -66,10 +67,11 @@ moto==1.3.7
 msgpack==0.5.6
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
+packaging==19.2           # via pytest
 paramiko==2.4.2
-pathlib2==2.3.3           # via pytest
+pathlib2==2.3.3           # via importlib-metadata, pytest
 pathtools==0.1.2          # via watchdog
-pluggy==0.9.0             # via pytest
+pluggy==0.13.0            # via pytest
 portend==2.4              # via cherrypy
 psutil==5.6.1
 py==1.8.0                 # via pytest
@@ -84,14 +86,13 @@ pygit2==0.28.2
 pyinotify==0.9.6
 pynacl==1.3.0             # via paramiko
 pyopenssl==19.0.0
+pyparsing==2.4.5          # via packaging
 pyserial==3.4             # via junos-eznc
-pytest-cov==2.6.1
 pytest-helpers-namespace==2019.1.8
-pytest-salt-runtests-bridge==2019.1.30
-pytest-salt==2018.12.8
-pytest-tempdir==2018.8.11
-pytest-timeout==1.3.3
-pytest==4.4.1
+pytest-salt-runtests-bridge==2019.7.10
+pytest-salt==2019.11.27
+pytest-tempdir==2019.10.12
+pytest==4.6.6
 python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto
 python-etcd==0.4.5
 python-gnupg==0.4.4
@@ -112,7 +113,7 @@ selectors2==2.0.1         # via ncclient
 setproctitle==1.1.10
 setuptools-scm==3.2.0
 singledispatch==3.4.0.3   # via tornado
-six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pygit2, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
+six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, packaging, pathlib2, pygit2, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 supervisor==3.3.5 ; python_version < "3"
@@ -122,8 +123,10 @@ tornado==4.5.3 ; python_version < "3"
 urllib3==1.24.2           # via botocore, kubernetes, python-etcd, requests
 virtualenv==16.4.3
 watchdog==0.9.0
+wcwidth==0.1.7            # via pytest
 websocket-client==0.40.0  # via docker, kubernetes
 werkzeug==0.15.6          # via moto
 wrapt==1.11.1             # via aws-xray-sdk
 xmltodict==0.12.0         # via moto
 zc.lockfile==1.4          # via cherrypy
+zipp==0.6.0               # via importlib-metadata

requirements/static/py2.7/windows.txt

@@ -24,9 +24,9 @@ chardet==3.0.4            # via requests
 cheroot==6.5.5            # via cherrypy
 cherrypy==17.4.1
 colorama==0.4.1           # via pytest
-contextlib2==0.5.5        # via cherrypy
+configparser==4.0.2       # via importlib-metadata
+contextlib2==0.5.5        # via cherrypy, importlib-metadata
 cookies==2.2.1            # via responses
-coverage==4.5.3           # via pytest-cov
 cryptography==2.6.1
 dmidecode==0.9.0
 dnspython==1.16.0
@@ -44,6 +44,7 @@ gitdb==0.6.4
 gitpython==2.1.10
 google-auth==1.6.3        # via kubernetes
 idna==2.8
+importlib-metadata==0.23  # via pluggy, pytest
 ioloop==0.1a0
 ipaddress==1.0.22
 jaraco.functools==2.0     # via tempora
@@ -64,10 +65,11 @@ more-itertools==5.0.0
 moto==1.3.7
 msgpack-python==0.5.6
 msgpack==0.5.6
+packaging==19.2           # via pytest
 patch==1.16
-pathlib2==2.3.3           # via pytest
+pathlib2==2.3.3           # via importlib-metadata, pytest
 pathtools==0.1.2          # via watchdog
-pluggy==0.9.0             # via pytest
+pluggy==0.13.0            # via pytest
 portend==2.4              # via cherrypy
 psutil==5.6.1
 py==1.8.0                 # via pytest
@@ -81,13 +83,12 @@ pycurl==7.43.0.2
 pygit2==0.28.2
 pymysql==0.9.3
 pyopenssl==19.0.0
-pytest-cov==2.6.1
+pyparsing==2.4.5          # via packaging
 pytest-helpers-namespace==2019.1.8
-pytest-salt-runtests-bridge==2019.1.30
-pytest-salt==2018.12.8
-pytest-tempdir==2018.8.11
-pytest-timeout==1.3.3
-pytest==4.4.1
+pytest-salt-runtests-bridge==2019.7.10
+pytest-salt==2019.11.27
+pytest-tempdir==2019.10.12
+pytest==4.6.6
 python-dateutil==2.8.0
 python-etcd==0.4.5
 python-gnupg==0.4.4
@@ -108,7 +109,7 @@ scandir==1.10.0           # via pathlib2
 sed==0.3.1
 setproctitle==1.1.10
 singledispatch==3.4.0.3
-six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, pathlib2, pygit2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
+six==1.12.0               # via cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, kubernetes, mock, more-itertools, moto, packaging, pathlib2, pygit2, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 smmap==0.9.0
 strict-rfc3339==0.7
@@ -119,10 +120,12 @@ tornado==4.5.3 ; python_version < "3"
 urllib3==1.24.2           # via botocore, kubernetes, python-etcd, requests
 virtualenv==16.4.3
 watchdog==0.9.0
+wcwidth==0.1.7            # via pytest
 websocket-client==0.40.0  # via docker, kubernetes
 werkzeug==0.15.6          # via moto
 wheel==0.33.4
 wmi==1.4.9
 wrapt==1.11.1             # via aws-xray-sdk
 xmltodict==0.12.0         # via moto
 zc.lockfile==1.4          # via cherrypy
+zipp==0.6.0               # via importlib-metadata

requirements/static/py3.4/linux.txt

@@ -24,7 +24,6 @@ chardet==3.0.4            # via requests
 cheroot==6.5.4            # via cherrypy
 cherrypy==17.3.0
 contextlib2==0.5.5        # via cherrypy
-coverage==4.5.3           # via pytest-cov
 croniter==0.3.29
 cryptography==2.6.1       # via moto, paramiko, pyopenssl
 dnspython==1.16.0
@@ -38,6 +37,7 @@ gitpython==2.1.11
 google-auth==1.6.3        # via kubernetes
 hgtools==8.1.1
 idna==2.8                 # via requests
+importlib-metadata==0.23  # via pluggy, pytest
 ipaddress==1.0.22         # via kubernetes
 jaraco.functools==2.0     # via tempora
 jinja2==2.10.1
@@ -58,10 +58,11 @@ moto==1.3.7
 msgpack==0.5.6
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
+packaging==19.2           # via pytest
 paramiko==2.4.2
-pathlib2==2.3.3           # via pytest
+pathlib2==2.3.3           # via importlib-metadata, pytest
 pathtools==0.1.2          # via watchdog
-pluggy==0.9.0             # via pytest
+pluggy==0.13.0            # via pytest
 portend==2.4              # via cherrypy
 psutil==5.6.1
 py==1.8.0                 # via pytest
@@ -76,14 +77,13 @@ pygit2==0.28.2
 pyinotify==0.9.6
 pynacl==1.3.0             # via paramiko
 pyopenssl==19.0.0
+pyparsing==2.4.5          # via packaging
 pyserial==3.4             # via junos-eznc
-pytest-cov==2.6.1
 pytest-helpers-namespace==2019.1.8
-pytest-salt-runtests-bridge==2019.1.30
-pytest-salt==2018.12.8
-pytest-tempdir==2018.8.11
-pytest-timeout==1.3.3
-pytest==4.4.1
+pytest-salt-runtests-bridge==2019.7.10
+pytest-salt==2019.11.27
+pytest-tempdir==2019.10.12
+pytest==4.6.6
 python-dateutil==2.8.0    # via botocore, croniter, kubernetes, moto
 python-etcd==0.4.5
 python-gnupg==0.4.4
@@ -104,7 +104,7 @@ selectors2==2.0.1         # via ncclient
 setproctitle==1.1.10
 setuptools-scm==3.2.0
 singledispatch==3.4.0.3   # via tornado
-six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pygit2, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
+six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kazoo, kubernetes, mock, more-itertools, moto, ncclient, packaging, pathlib2, pygit2, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 strict-rfc3339==0.7
 tempora==1.14.1           # via portend
@@ -113,8 +113,10 @@ tornado==4.5.3 ; python_version >= "3.4"
 urllib3==1.24.2           # via botocore, kubernetes, python-etcd, requests
 virtualenv==16.4.3
 watchdog==0.9.0
+wcwidth==0.1.7            # via pytest
 websocket-client==0.40.0  # via docker, kubernetes
 werkzeug==0.15.6          # via moto
 wrapt==1.11.1             # via aws-xray-sdk
 xmltodict==0.12.0         # via moto
 zc.lockfile==1.4          # via cherrypy
+zipp==0.6.0               # via importlib-metadata

requirements/static/py3.5/darwin.txt

@@ -26,7 +26,6 @@ cherrypy==17.4.1
 click==7.0
 clustershell==1.8.1
 contextlib2==0.5.5        # via cherrypy
-coverage==4.5.3           # via pytest-cov
 croniter==0.3.29
 cryptography==2.6.1
 dnspython==1.16.0
@@ -41,6 +40,7 @@ gitdb==0.6.4
 gitpython==2.1.11
 google-auth==1.6.3        # via kubernetes
 idna==2.8
+importlib-metadata==0.23  # via pluggy, pytest
 ipaddress==1.0.22
 jaraco.functools==2.0     # via tempora
 jinja2==2.10.1
@@ -63,10 +63,11 @@ msgpack-python==0.5.6
 msgpack==0.5.6
 ncclient==0.6.4           # via junos-eznc
 netaddr==0.7.19           # via junos-eznc
+packaging==19.2           # via pytest
 paramiko==2.4.2           # via junos-eznc, ncclient, scp
 pathlib2==2.3.3           # via pytest
 pathtools==0.1.2          # via watchdog
-pluggy==0.9.0             # via pytest
+pluggy==0.13.1            # via pytest
 portend==2.4              # via cherrypy
 psutil==5.6.1
 py==1.8.0                 # via pytest
@@ -79,14 +80,13 @@ pycparser==2.19
 pycryptodome==3.8.1
 pynacl==1.3.0             # via paramiko
 pyopenssl==19.0.0
+pyparsing==2.4.5          # via packaging
 pyserial==3.4             # via junos-eznc
-pytest-cov==2.6.1
 pytest-helpers-namespace==2019.1.8
-pytest-salt-runtests-bridge==2019.1.30
-pytest-salt==2018.12.8
-pytest-tempdir==2018.8.11
-pytest-timeout==1.3.3
-pytest==4.4.1
+pytest-salt-runtests-bridge==2019.7.10
+pytest-salt==2019.11.27
+pytest-tempdir==2019.10.12
+pytest==4.6.6
 python-dateutil==2.8.0
 python-etcd==0.4.5
 python-gnupg==0.4.4
@@ -104,7 +104,7 @@ salttesting==2017.6.1
 scp==0.13.2               # via junos-eznc
 setproctitle==1.1.10
 singledispatch==3.4.0.3
-six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, pathlib2, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
+six==1.12.0               # via bcrypt, cheroot, cherrypy, cryptography, docker, docker-pycreds, google-auth, junos-eznc, kubernetes, mock, more-itertools, moto, ncclient, packaging, pathlib2, pynacl, pyopenssl, pytest, python-dateutil, python-jose, pyvmomi, responses, salttesting, singledispatch, tempora, websocket-client
 smmap2==2.0.5             # via gitdb2
 smmap==0.9.0
 strict-rfc3339==0.7
@@ -115,11 +115,13 @@ urllib3==1.24.2           # via botocore, kubernetes, python-etcd, requests
 virtualenv==16.4.3
 vultr==1.0.1
 watchdog==0.9.0
+wcwidth==0.1.7            # via pytest
 websocket-client==0.40.0  # via docker, kubernetes
 werkzeug==0.15.6          # via moto
 wrapt==1.11.1             # via aws-xray-sdk
 xmltodict==0.12.0         # via moto
 yamlordereddictloader==0.4.0
 zc.lockfile==1.4          # via cherrypy
+zipp==0.6.0               # via importlib-metadata
 # Passthrough dependencies from pkg/osx/req.txt
 pyobjc==5.1.2