summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.stestr.conf3
-rw-r--r--tox.ini11
2 files changed, 9 insertions, 5 deletions
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..5fcccac
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
1[DEFAULT]
2test_path=./unit_tests
3top_dir=./
diff --git a/tox.ini b/tox.ini
index 54e8cc7..2f1058c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,9 +2,8 @@
2# This file is managed centrally by release-tools and should not be modified 2# This file is managed centrally by release-tools and should not be modified
3# within individual charm repos. 3# within individual charm repos.
4[tox] 4[tox]
5envlist = pep8,py27,py3{5,6} 5envlist = pep8,py3
6skipsdist = True 6skipsdist = True
7skip_missing_interpreters = True
8 7
9[testenv] 8[testenv]
10setenv = VIRTUAL_ENV={envdir} 9setenv = VIRTUAL_ENV={envdir}
@@ -17,9 +16,6 @@ commands = ostestr {posargs}
17whitelist_externals = juju 16whitelist_externals = juju
18passenv = HOME TERM AMULET_* CS_API_* 17passenv = HOME TERM AMULET_* CS_API_*
19 18
20[testenv:py27]
21commands = /bin/true
22
23[testenv:py35] 19[testenv:py35]
24basepython = python3.5 20basepython = python3.5
25deps = -r{toxinidir}/requirements.txt 21deps = -r{toxinidir}/requirements.txt
@@ -30,6 +26,11 @@ basepython = python3.6
30deps = -r{toxinidir}/requirements.txt 26deps = -r{toxinidir}/requirements.txt
31 -r{toxinidir}/test-requirements.txt 27 -r{toxinidir}/test-requirements.txt
32 28
29[testenv:py3]
30basepython = python3
31deps = -r{toxinidir}/requirements.txt
32 -r{toxinidir}/test-requirements.txt
33
33[testenv:pep8] 34[testenv:pep8]
34basepython = python3 35basepython = python3
35deps = -r{toxinidir}/requirements.txt 36deps = -r{toxinidir}/requirements.txt