diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 350b264d8891a58f8b268c36b7d0315962ff382e..0371a7f7f806a9a6e9ac5c22d8c5562c6880a4eb 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 20ed449cd8f17f9110ebe1b70774916abe8c00cb..1cd8ccb799fd1dc8b3b25db9051cb12d42d63bb3 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 239dce0235dcd2b2a6a2a731f373e84c49ea671b..e0d1c6baf58948cdbee5a71ff2f859ab429dcd4b 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 b9bc7c4a9b743112a472e4e7370f3dd9f8582ded..1349c50ca993b51bb866a7880e3e7fb185049de8 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