Merge pull request #2964 from Uninett/test/move-snmpsim-requirement

Fix more snmpsim problems
Uninett · Sep 12, 2024 · 5514304 · 5514304
2 parents cba5a18 + bc56ce4
commit 5514304
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -53,7 +53,7 @@ jobs:
       - name: "Install test runner dependencies"
         run: |
           set -xe
-          python3 -m pip install --upgrade 'pip==23.1.0' setuptools wheel 'tox<4' tox-gh-actions coverage virtualenv 'snmpsim>=1.0'
+          python3 -m pip install --upgrade 'pip==23.1.0' setuptools wheel 'tox<4' tox-gh-actions coverage virtualenv
           sudo apt-get install -y nbtscan
 
       # virtualenv seems to currently be embedding a broken version of

diff --git a/tests/docker/Dockerfile b/tests/docker/Dockerfile
@@ -67,7 +67,7 @@ RUN cd /tmp && \
     mv chromedriver /usr/local/bin/
 
 # Install our primary test runner
-RUN python3.9 -m pip install 'tox<4' 'snmpsim>=1.0' virtualenv
+RUN python3.9 -m pip install 'tox<4' virtualenv
 
 # Add a build user
 ENV USER build

diff --git a/tests/requirements.txt b/tests/requirements.txt
@@ -12,6 +12,8 @@ pytest-timeout
 pytest-twisted~=1.13.0
 pytidylib==0.3.2
 selenium==3.141.0
+snmpsim>=1.0
+pyasn1<0.6.0  # Really just a constraint because of incompatibility with snmpsim
 toml
 whisper>=0.9.9
 whitenoise==4.1.4