From dc835adf05b7b0232f907da68f3739386e0e7d40 Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Fri, 20 Aug 2021 13:19:42 -0400 Subject: [PATCH] Fix running tests for cirrus-ci_artifacts Signed-off-by: Chris Evich --- ci/Dockerfile | 2 +- cirrus-ci_artifacts/.gitignore | 1 + cirrus-ci_artifacts/requirements.txt | 28 +++++++++++++++-------- cirrus-ci_artifacts/test/run_all_tests.sh | 9 +++++++- 4 files changed, 29 insertions(+), 11 deletions(-) create mode 100644 cirrus-ci_artifacts/.gitignore diff --git a/ci/Dockerfile b/ci/Dockerfile index e820488..40f66ce 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -5,7 +5,7 @@ RUN microdnf update -y && \ perl-YAML perl-interpreter perl-open perl-Data-TreeDumper \ perl-Test perl-Test-Simple perl-Test-Differences \ perl-YAML-LibYAML perl-FindBin \ - python3 python3-pip gcc python3-devel \ + python3 python3-virtualenv python3-pip gcc python3-devel \ python3-flake8 python3-pep8-naming python3-flake8-docstrings python3-flake8-import-order python3-flake8-polyfill python3-mccabe python3-pep8-naming && \ microdnf clean all && \ rm -rf /var/cache/dnf diff --git a/cirrus-ci_artifacts/.gitignore b/cirrus-ci_artifacts/.gitignore new file mode 100644 index 0000000..08cfdb7 --- /dev/null +++ b/cirrus-ci_artifacts/.gitignore @@ -0,0 +1 @@ +./testvenv/ diff --git a/cirrus-ci_artifacts/requirements.txt b/cirrus-ci_artifacts/requirements.txt index 69c9d0f..b116ba8 100644 --- a/cirrus-ci_artifacts/requirements.txt +++ b/cirrus-ci_artifacts/requirements.txt @@ -1,9 +1,19 @@ -aiohttp==3.7.4 -async-timeout==3.0.1 -attrs==20.2.0 -certifi==2020.6.20 -gql==3.0.0a3 -multidict==4.7.6 -requests==2.24.0 -websockets==8.1 -yarl==1.5.1 +aiohttp>=3.7.4.post0 +async-timeout>=3.0.1 +attrs>=21.2.0 +certifi>=2021.5.30 +chardet>=4.0.0 +charset-normalizer>=2.0.4 +gql>=2.0.0 +graphql-core>=2.3.2 +idna>=3.2 +multidict>=5.1.0 +pipe>=1.6.0 +promise>=2.3 +PyYAML>=5.4.1 +requests>=2.26.0 +Rx>=1.6.1 +six>=1.16.0 +typing-extensions>=3.10.0.0 +urllib3>=1.26.6 +yarl>=1.6.3 diff --git a/cirrus-ci_artifacts/test/run_all_tests.sh b/cirrus-ci_artifacts/test/run_all_tests.sh index 934aaee..fcdad92 100755 --- a/cirrus-ci_artifacts/test/run_all_tests.sh +++ b/cirrus-ci_artifacts/test/run_all_tests.sh @@ -8,7 +8,14 @@ fi TESTDIR=$(dirname ${BASH_SOURCE[0]}) cd "$TESTDIR/../" -pip3 install --user --requirement ./requirements.txt +virtualenv testvenv + +set -a +source testvenv/bin/activate +set +a + +testvenv/bin/python -m pip install --upgrade pip +pip3 install --requirement ./requirements.txt cd "$TESTDIR" ./test_cirrus-ci_artifacts.py