summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-07-12 16:17:58 +0000
committerGerrit Code Review <review@openstack.org>2018-07-12 16:17:58 +0000
commit767ea9f5f6a38971cef10368868820bcabad3f55 (patch)
tree2bb8cf1f55f1c9373cb22908fbdd676047a63190
parent8aff4a0149e89f718079b87603ba4dd1fdc5c2a7 (diff)
parentbfcbef7e9c80e404effdc7355d08255759317c25 (diff)
Merge "Switch to stestr"HEADmaster
-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 b774adf..cb32b7d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,4 @@ build
7*.swp 7*.swp
8*.swo 8*.swo
9*.pyc 9*.pyc
10.testrepository \ No newline at end of file 10.stestr/
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 ae94240..28829dc 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,6 +4,6 @@
4pbr>=0.6,!=0.7,<1.0 4pbr>=0.6,!=0.7,<1.0
5oslosphinx>=2.2.0 # Apache-2.0 5oslosphinx>=2.2.0 # Apache-2.0
6sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 6sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
7testrepository>=0.0.18 7stestr>=2.0.0 # Apache-2.0
8testtools>=0.9.36,!=1.2.0 8testtools>=0.9.36,!=1.2.0
9yasfb>=0.5.1 9yasfb>=0.5.1
diff --git a/tox.ini b/tox.ini
index 0286b0c..f2cd638 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,7 @@ usedevelop = True
10setenv = VIRTUAL_ENV={envdir} 10setenv = VIRTUAL_ENV={envdir}
11install_command = pip install -U {opts} {packages} 11install_command = pip install -U {opts} {packages}
12deps = -r{toxinidir}/requirements.txt 12deps = -r{toxinidir}/requirements.txt
13commands = python setup.py testr --slowest --testr-args='{posargs}' 13commands = stestr run --slowest {posargs}
14 14
15[testenv:venv] 15[testenv:venv]
16commands = {posargs} 16commands = {posargs}