From 1e6be63e73b58e3ef15fc9c61396deb1903cb772 Mon Sep 17 00:00:00 2001 From: James Page Date: Wed, 9 Nov 2016 12:54:38 +0000 Subject: [PATCH] tests: use test-requirements.txt for bundletester support Ensure bundletester uses a virtualenv and can resolve test dependencies required to execute functional tests. Change-Id: If2a924ab42547c9a62561112ae2273ba1cfed87e Close-Bug: 1664128 --- tests/test-requirements.txt | 1 + tests/tests.yaml | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 120000 tests/test-requirements.txt diff --git a/tests/test-requirements.txt b/tests/test-requirements.txt new file mode 120000 index 00000000..3c874339 --- /dev/null +++ b/tests/test-requirements.txt @@ -0,0 +1 @@ +../test-requirements.txt \ No newline at end of file diff --git a/tests/tests.yaml b/tests/tests.yaml index 4cf93d01..99ca6242 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -3,7 +3,7 @@ bootstrap: True # Re-use bootstrap node. reset: True # Use tox/requirements to drive the venv instead of bundletester's venv feature. -virtualenv: False +virtualenv: True # Leave makefile empty, otherwise unit/lint tests will rerun ahead of amulet. makefile: [] # Do not specify juju PPA sources. Juju is presumed to be pre-installed @@ -15,3 +15,5 @@ makefile: [] # and tox instead. ie. The venv is constructed before bundletester # is invoked. #python-packages: +requirements: + - test-requirements.txt