From 2af177b753a73a5a3c0133a3eaa77bd04e4a141e Mon Sep 17 00:00:00 2001 From: GeorgianaElena Date: Mon, 17 Feb 2020 16:35:48 +0200 Subject: [PATCH] Use pip from hub env to run tests --- .circleci/integration-test.py | 10 ++++++---- integration-tests/requirements.txt | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.circleci/integration-test.py b/.circleci/integration-test.py index 1039d45..3a3dcbd 100755 --- a/.circleci/integration-test.py +++ b/.circleci/integration-test.py @@ -86,19 +86,21 @@ def run_test(image_name, test_name, test_files, installer_args): ) copy_to_container(test_name, os.path.join(source_path, 'bootstrap/'), '/srv/src') + copy_to_container(test_name, os.path.join(source_path, 'integration-tests/'), '/srv/src') run_container_command( test_name, f'python3 /srv/src/bootstrap.py {installer_args}' ) - copy_to_container(test_name, os.path.join(source_path, 'integration-tests/'), '/srv/src') + # Install pkgs from requirements in hub's pip, where + # the bootstrap script installed the others run_container_command( test_name, - 'python3 -m pip install -r /srv/src/requirements.txt' + '/opt/tljh/hub/bin/python3 -m pip install -r /srv/src/integration-tests/requirements.txt' ) run_container_command( test_name, - 'python3 -m pytest -v {}'.format( - ' '.join([os.path.join('/srv/src/', f) for f in test_files]) + '/opt/tljh/hub/bin/python3 -m pytest -v {}'.format( + ' '.join([os.path.join('/srv/src/integration-tests/', f) for f in test_files]) ) ) diff --git a/integration-tests/requirements.txt b/integration-tests/requirements.txt index 271c563..a6f3d17 100644 --- a/integration-tests/requirements.txt +++ b/integration-tests/requirements.txt @@ -1,3 +1,3 @@ pytest pytest-asyncio -git+https://github.com/yuvipanda/hubtraf.git \ No newline at end of file +git+https://github.com/yuvipanda/hubtraf.git