Add pytest-timeout and refactor requirements.txt files

client/requirements.txt

@@ -1,2 +1 @@
-pytest>=6.2.5
 requests

pytest.ini

@@ -1,9 +1,10 @@
 [pytest]
 addopts = -s
-log_cli=False
-log_level=INFO
+log_cli = False
+log_level = INFO
 filterwarnings=
   # Issue #557 in `pytest-cov` (currently v4.x) has not moved for a while now,
   # but once a resolution has been adopted we can drop this "ignore".
   # Ref: https://github.com/pytest-dev/pytest-cov/issues/557
   ignore:The --rsyncdir command line argument and rsyncdirs config variable are deprecated.:DeprecationWarning
+timeout = 300

server/test-requirements.txt

@@ -1,13 +1,3 @@
-coverage
-filelock
-gitpython
-mock>=3.0.5
-pytest>=6.2.5
-pytest-cov>=2.7.1
-pytest-freezegun
-pytest-helpers-namespace==2019.1.8
-pytest-mock
 pytest-dependency  # functional tests
-pytest-xdist
+pytest-freezegun
 requests_mock
-responses

agent/test-requirements.txt → test-requirements.txt

@@ -6,5 +6,6 @@ pytest>=6.2.5
 pytest-cov>=2.7.1
 pytest-helpers-namespace==2019.1.8
 pytest-mock
+pytest-timeout
 pytest-xdist
 responses

tox.ini

@@ -28,9 +28,9 @@ setenv =
     SKIP_WRITE_GIT_CHANGELOG = 1
 deps =
     -r{toxinidir}/agent/requirements.txt
-    -r{toxinidir}/agent/test-requirements.txt
     -r{toxinidir}/client/requirements.txt
     -r{toxinidir}/server/requirements.txt
+    -r{toxinidir}/test-requirements.txt
     -r{toxinidir}/server/test-requirements.txt
 commands =
     bash -c "{toxinidir}/exec-tests {envdir} {posargs}"
@@ -43,7 +43,7 @@ basepython = python3.6
 deps =
     -c{toxinidir}/agent/test-constraints-3.6.txt
     -r{toxinidir}/agent/requirements.txt
-    -r{toxinidir}/agent/test-requirements.txt
+    -r{toxinidir}/test-requirements.txt
 
 [testenv:alembic-migration]
 description = Verify alembic migrations cover latest database schema