summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-11-27 16:07:10 +0000
committerGerrit Code Review <review@openstack.org>2018-11-27 16:07:10 +0000
commita3a5deccf169f18fd729eb61d3eb41de1916caff (patch)
treec57bbabcfedcab6ecf258aaa841089ce729a4b86
parented7a513c83e80d42ed9a2ba164d3c463c7fffca6 (diff)
parentabe1509c6f5ba1d8ff7869a555a49336ee74b45f (diff)
Merge "Switch to stestr"
-rw-r--r--.gitignore2
-rw-r--r--.stestr.conf4
-rw-r--r--.testr.conf4
-rw-r--r--requirements.txt2
-rw-r--r--tox.ini2
5 files changed, 7 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore
index 478debc..0992b16 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,5 +7,5 @@ build
7*.swp 7*.swp
8*.swo 8*.swo
9*.pyc 9*.pyc
10.testrepository 10.stestr/
11.DS_Store 11.DS_Store
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..dcdf16e
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,4 @@
1[DEFAULT]
2test_path=./tests
3top_dir=./
4
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index 1641f86..0000000
--- a/.testr.conf
+++ /dev/null
@@ -1,4 +0,0 @@
1[DEFAULT]
2test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 OS_TEST_TIMEOUT=60 ${PYTHON:-python} -m subunit.run discover -t ./ . $LISTOPT $IDOPTION
3test_id_option=--load-list $IDFILE
4test_list_option=--list
diff --git a/requirements.txt b/requirements.txt
index 8029a7d..d0299d6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ sphinxcontrib-actdiag
9sphinxcontrib-blockdiag 9sphinxcontrib-blockdiag
10sphinxcontrib-nwdiag 10sphinxcontrib-nwdiag
11sphinxcontrib-seqdiag 11sphinxcontrib-seqdiag
12testrepository>=0.0.18 12stestr>=2.0.0
13testtools>=0.9.34 13testtools>=0.9.34
14yasfb>=0.5.1 14yasfb>=0.5.1
15whereto>=0.3.0 # Apache-2.0 15whereto>=0.3.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 1433a45..3ca625e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,7 +8,7 @@ usedevelop = True
8setenv = VIRTUAL_ENV={envdir} 8setenv = VIRTUAL_ENV={envdir}
9install_command = pip install -U {opts} {packages} 9install_command = pip install -U {opts} {packages}
10deps = -r{toxinidir}/requirements.txt 10deps = -r{toxinidir}/requirements.txt
11commands = python setup.py testr --slowest --testr-args='{posargs}' 11commands = stestr run --slowest {posargs}
12 12
13[testenv:venv] 13[testenv:venv]
14basepython = python3 14basepython = python3