Use nox to run tests in GitHub Actions

1 files changed, 22 insertions, 14 deletions

diff --git a/noxfile.py b/noxfile.py
index ddc94e0..750bfb6 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -1,5 +1,8 @@
-"""Notes:
-* 'test-<python version>' commands: nox will use poetry.lock to determine dependency versions
+"""Runner script for tools used in local development and CI.
+
+Notes:
+* 'test' and 'test-<python version>' commands: nox will create separate virtualenvs per python
+  version, and use `poetry.lock` to determine dependency versions
 * 'lint' command: tools and environments are managed by pre-commit
 * All other commands: the current environment will be used instead of creating new ones
 * Run `nox -l` to see all available commands
@@ -18,25 +21,32 @@ LIVE_DOCS_IGNORE = ['*.pyc', '*.tmp', join('**', 'modules', '*')]
 LIVE_DOCS_WATCH = ['requests_cache', 'examples']
 CLEAN_DIRS = ['dist', 'build', join('docs', '_build'), join('docs', 'modules')]
 
+PYTHON_VERSIONS = ['3.7', '3.8', '3.9', '3.10']
 UNIT_TESTS = join('tests', 'unit')
 INTEGRATION_TESTS = join('tests', 'integration')
 STRESS_TEST_MULTIPLIER = 10
-COVERAGE_ARGS = (
-    '--cov --cov-report=term --cov-report=html'  # Generate HTML + stdout coverage report
-)
-XDIST_ARGS = '--numprocesses=auto --dist=loadfile'  # Run tests in parallel, grouped by test module
+# Generate HTML + stdout coverage report
+COVERAGE_ARGS = '--cov --cov-report=term --cov-report=html'
+# Run tests in parallel, grouped by test module
+XDIST_ARGS = '--numprocesses=auto --dist=loadfile'
 
 
-@session(python=['3.7', '3.8', '3.9', '3.10'])
+@session(python=PYTHON_VERSIONS)
 def test(session):
-    """Run tests for a specific python version"""
-    test_paths = session.posargs or [UNIT_TESTS]
+    """Run tests in a separate virtualenv per python version"""
+    test_paths = session.posargs or [UNIT_TESTS, INTEGRATION_TESTS]
     session.install('.', 'pytest', 'pytest-xdist', 'requests-mock', 'timeout-decorator')
 
-    cmd = f'pytest -rs {XDIST_ARGS}'
+    cmd = f'pytest -rs -x {XDIST_ARGS}'
     session.run(*cmd.split(' '), *test_paths)
 
 
+@session(python=False, name='test-current')
+def test_current(session):
+    """Run tests using the current virtualenv"""
+    test(session)
+
+
 @session(python=False)
 def clean(session):
     """Clean up temporary build + documentation files"""
@@ -48,10 +58,8 @@ def clean(session):
 @session(python=False, name='cov')
 def coverage(session):
     """Run tests and generate coverage report"""
-    cmd_1 = f'pytest {UNIT_TESTS} -rs {XDIST_ARGS} {COVERAGE_ARGS}'
-    cmd_2 = f'pytest {INTEGRATION_TESTS} -rs {XDIST_ARGS} {COVERAGE_ARGS} --cov-append'
-    session.run(*cmd_1.split(' '))
-    session.run(*cmd_2.split(' '))
+    cmd = f'pytest {UNIT_TESTS} {INTEGRATION_TESTS} -rs {XDIST_ARGS} {COVERAGE_ARGS}'
+    session.run(*cmd.split(' '))
 
 
 @session(python=False, name='stress')