summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.stestr.conf3
-rw-r--r--.testr.conf8
-rw-r--r--src/test-requirements.txt2
-rw-r--r--test-requirements.txt2
-rw-r--r--tox.ini8
5 files changed, 9 insertions, 14 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/.testr.conf b/.testr.conf
deleted file mode 100644
index 801646b..0000000
--- a/.testr.conf
+++ /dev/null
@@ -1,8 +0,0 @@
1[DEFAULT]
2test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
3 OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
4 OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
5 ${PYTHON:-python} -m subunit.run discover -t ./ ./unit_tests $LISTOPT $IDOPTION
6
7test_id_option=--load-list $IDFILE
8test_list_option=--list
diff --git a/src/test-requirements.txt b/src/test-requirements.txt
index f013863..e56db9a 100644
--- a/src/test-requirements.txt
+++ b/src/test-requirements.txt
@@ -5,7 +5,7 @@ charm-tools>=2.4.4
5coverage>=3.6 5coverage>=3.6
6mock>=1.2 6mock>=1.2
7flake8>=2.2.4,<=2.4.1 7flake8>=2.2.4,<=2.4.1
8os-testr>=0.4.1 8stestr>=2.2.0
9requests>=2.18.4 9requests>=2.18.4
10# BEGIN: Amulet OpenStack Charm Helper Requirements 10# BEGIN: Amulet OpenStack Charm Helper Requirements
11# Liberty client lower constraints 11# Liberty client lower constraints
diff --git a/test-requirements.txt b/test-requirements.txt
index ca62003..14b380e 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,7 +4,7 @@
4# 4#
5# Lint and unit test requirements 5# Lint and unit test requirements
6flake8>=2.2.4,<=2.4.1 6flake8>=2.2.4,<=2.4.1
7os-testr>=0.4.1 7stestr>=2.2.0
8requests>=2.18.4 8requests>=2.18.4
9charms.reactive 9charms.reactive
10mock>=1.2 10mock>=1.2
diff --git a/tox.ini b/tox.ini
index 8565faf..8b1cc0e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -35,17 +35,17 @@ commands = true
35[testenv:py34] 35[testenv:py34]
36basepython = python3.4 36basepython = python3.4
37deps = -r{toxinidir}/test-requirements.txt 37deps = -r{toxinidir}/test-requirements.txt
38commands = ostestr {posargs} 38commands = stestr run {posargs}
39 39
40[testenv:py35] 40[testenv:py35]
41basepython = python3.5 41basepython = python3.5
42deps = -r{toxinidir}/test-requirements.txt 42deps = -r{toxinidir}/test-requirements.txt
43commands = ostestr {posargs} 43commands = stestr run {posargs}
44 44
45[testenv:py36] 45[testenv:py36]
46basepython = python3.6 46basepython = python3.6
47deps = -r{toxinidir}/test-requirements.txt 47deps = -r{toxinidir}/test-requirements.txt
48commands = ostestr {posargs} 48commands = stestr run {posargs}
49 49
50[testenv:pep8] 50[testenv:pep8]
51basepython = python3.5 51basepython = python3.5
@@ -63,7 +63,7 @@ setenv =
63 PYTHON=coverage run 63 PYTHON=coverage run
64commands = 64commands =
65 coverage erase 65 coverage erase
66 ostestr {posargs} 66 stestr run {posargs}
67 coverage combine 67 coverage combine
68 coverage html -d cover 68 coverage html -d cover
69 coverage xml -o cover/coverage.xml 69 coverage xml -o cover/coverage.xml