Skip to content

SpiderFoot automates OSINT for threat intelligence and mapping your attack surface.

Tests: Run flake8 lint test before pytest (#1757)

bcolesb546f9bc459c
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 7da6d8ae..b22df846 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -12,7 +12,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
- python-version: [3.7, 3.8, 3.9]
+ python-version: ["3.7", "3.8", "3.9", "3.10"]
os: [ubuntu-latest, macos-latest]
steps:
diff --git a/test/requirements.txt b/test/requirements.txt
index 28ea7508..9d983a28 100644
--- a/test/requirements.txt
+++ b/test/requirements.txt
@@ -1,7 +1,7 @@
-r ../requirements.txt
darglint==1.8.1
dlint==0.14.0
-flake8==4.0.1
+flake8==5.0.4
flake8-annotations==2.9.1
flake8-blind-except==0.2.1
flake8-bugbear==23.2.13
@@ -12,8 +12,7 @@ flake8-sfs==0.0.4
flake8-simplify==0.19.3
pytest==7.2.1
pytest-cov==4.0.0
-pytest-flake8==1.1.1
pytest-mock==3.10.0
pytest-xdist==3.2.0
-pycodestyle==2.8.0
+pycodestyle==2.9.0
responses==0.22.0
diff --git a/test/run b/test/run
index f4992abc..2f30c015 100755
--- a/test/run
+++ b/test/run
@@ -1,8 +1,12 @@
#!/bin/bash
-# Run unit and integration tests.
+# Run unit and integration tests (excluding module integration tests).
# These same tests are run on all pull requests automatically.
#
# Must be run from SpiderFoot root directory; ie:
# ./test/run
-time python3.9 -m pytest -n auto --flake8 --dist loadfile --ignore=test/integration/modules/ --durations=5 --cov-report html --cov=. .
+echo Running flake8 ...
+time python3 -m flake8 . --count --show-source --statistics || exit
+
+echo Running pytest ...
+time python3 -m pytest -n auto --dist loadfile --ignore=test/integration/modules/ --durations=5 --cov-report html --cov=. .