From 61c39ec5b476db11a22835549938ce7a8d60404b Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Tue, 12 Oct 2021 16:05:46 +0200
Subject: [PATCH] L2SS-412: Force installation of dependencies in integration
test and unit test through 'tox --recreate'. Moved test dependencies from
itango to test-requirements.txt.
---
.gitlab-ci.yml | 4 +---
devices/test-requirements.txt | 1 +
docker-compose/integration-test.yml | 2 +-
docker-compose/itango/lofar-requirements.txt | 2 --
4 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 350b264d8..0371a7f7f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,11 +43,9 @@ unit_test:
before_script:
- sudo apt-get update
- sudo apt-get install -y git
- - pip3 install -r devices/test-requirements.txt
- - pip3 install -r docker-compose/itango/lofar-requirements.txt
script:
- cd devices
- - tox -e py37
+ - tox --recreate -e py37
integration_test:
stage: integration-tests
allow_failure: true
diff --git a/devices/test-requirements.txt b/devices/test-requirements.txt
index 20ed449cd..1cd8ccb79 100644
--- a/devices/test-requirements.txt
+++ b/devices/test-requirements.txt
@@ -2,6 +2,7 @@
# order of appearance. Changing the order has an impact on the overall
# integration process, which may cause wedges in the gate later.
+asynctest>=0.13.0 # Apache-2.0
bandit>=1.6.0 # Apache-2.0
coverage>=5.2.0 # Apache-2.0
doc8>=0.8.0 # Apache-2.0
diff --git a/docker-compose/integration-test.yml b/docker-compose/integration-test.yml
index 239dce023..e0d1c6baf 100644
--- a/docker-compose/integration-test.yml
+++ b/docker-compose/integration-test.yml
@@ -26,4 +26,4 @@ services:
- --timeout=30
- --strict
- --
- - tox -e integration
+ - tox --recreate -e integration
diff --git a/docker-compose/itango/lofar-requirements.txt b/docker-compose/itango/lofar-requirements.txt
index b9bc7c4a9..1349c50ca 100644
--- a/docker-compose/itango/lofar-requirements.txt
+++ b/docker-compose/itango/lofar-requirements.txt
@@ -6,5 +6,3 @@ python-logstash-async
gitpython
PyMySQL[rsa]
sqlalchemy
-timeout-decorator
-asynctest
--
GitLab