summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore4
-rw-r--r--.stestr.conf3
-rw-r--r--.testr.conf7
-rw-r--r--test-requirements.txt2
-rw-r--r--tox.ini12
5 files changed, 16 insertions, 12 deletions
diff --git a/.gitignore b/.gitignore
index 963e589..1ec8ce5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,7 +27,7 @@ cover/
27!.coveragerc 27!.coveragerc
28.tox 28.tox
29nosetests.xml 29nosetests.xml
30.testrepository 30.stestr/
31.venv 31.venv
32 32
33# Translations 33# Translations
@@ -55,4 +55,4 @@ ChangeLog
55.*sw? 55.*sw?
56 56
57# Files created by releasenotes build 57# Files created by releasenotes build
58releasenotes/build \ No newline at end of file 58releasenotes/build
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..3aeee01
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
1[DEFAULT]
2test_path=./
3top_dir=./
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index 6d83b3c..0000000
--- a/.testr.conf
+++ /dev/null
@@ -1,7 +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 ./ . $LISTOPT $IDOPTION
6test_id_option=--load-list $IDFILE
7test_list_option=--list
diff --git a/test-requirements.txt b/test-requirements.txt
index b8835e3..a9c8b03 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -8,7 +8,7 @@ coverage!=4.4,>=4.0 # Apache-2.0
8python-subunit>=1.0.0 # Apache-2.0/BSD 8python-subunit>=1.0.0 # Apache-2.0/BSD
9sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD 9sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
10oslotest>=3.2.0 # Apache-2.0 10oslotest>=3.2.0 # Apache-2.0
11testrepository>=0.0.18 # Apache-2.0/BSD 11stestr>=2.0.0 # Apache-2.0
12testtools>=2.2.0 # MIT 12testtools>=2.2.0 # MIT
13openstackdocstheme>=1.18.1 # Apache-2.0 13openstackdocstheme>=1.18.1 # Apache-2.0
14# releasenotes 14# releasenotes
diff --git a/tox.ini b/tox.ini
index 2e16767..dfc83f6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,7 @@ setenv =
10 VIRTUAL_ENV={envdir} 10 VIRTUAL_ENV={envdir}
11 PYTHONWARNINGS=default::DeprecationWarning 11 PYTHONWARNINGS=default::DeprecationWarning
12deps = -r{toxinidir}/test-requirements.txt 12deps = -r{toxinidir}/test-requirements.txt
13commands = python setup.py test --slowest --testr-args='{posargs}' 13commands = stestr run --slowest {posargs}
14 14
15[testenv:pep8] 15[testenv:pep8]
16basepython = python3 16basepython = python3
@@ -22,7 +22,15 @@ commands = {posargs}
22 22
23[testenv:cover] 23[testenv:cover]
24basepython = python3 24basepython = python3
25commands = python setup.py test --coverage --testr-args='{posargs}' 25setenv =
26 {[testenv]setenv}
27 PYTHON=coverage run --source solum_tempest_plugin --parallel-mode
28commands =
29 stestr run {posargs}
30 coverage combine
31 coverage html -d cover
32 coverage xml -o cover/coverage.xml
33 coverage report
26 34
27[testenv:docs] 35[testenv:docs]
28basepython = python3 36basepython = python3