summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-07-17 06:07:08 +0000
committerGerrit Code Review <review@openstack.org>2018-07-17 06:07:08 +0000
commit3fc25ae5478840e2d3c4b1a37205e635aae0af93 (patch)
tree8bf95d0c0134cafc976cab9a8c743d9443a0f83b
parent04fd927f6093e783e5aac91131551f990c17b396 (diff)
parent640bdac0ac2c4a0096c3d9162299ed57271f43ed (diff)
Merge "Switch to using stestr"HEADmaster
-rw-r--r--.gitignore3
-rw-r--r--.stestr.conf3
-rw-r--r--lower-constraints.txt2
-rw-r--r--test-requirements.txt2
-rwxr-xr-xtools/pretty_tox.sh6
-rw-r--r--tox.ini2
6 files changed, 9 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore
index 1a80f71..7e3e605 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,9 @@ ChangeLog
23cover 23cover
24api-ref/build/ 24api-ref/build/
25 25
26!/.stestr.conf
27.stestr/
28
26#Python 29#Python
27*.pyc 30*.pyc
28 31
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..2e0d10c
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
1[DEFAULT]
2test_path=${OS_TEST_PATH:-./murano/tests/unit}
3top_dir=./
diff --git a/lower-constraints.txt b/lower-constraints.txt
index fac47fe..cff1b2c 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -64,7 +64,7 @@ openstacksdk==0.12.0
64os-api-ref==1.4.0 64os-api-ref==1.4.0
65os-client-config==1.29.0 65os-client-config==1.29.0
66os-service-types==1.2.0 66os-service-types==1.2.0
67os-testr==1.0.0 67stestr==1.0.0
68osc-lib==1.10.0 68osc-lib==1.10.0
69oslo.cache==1.29.0 69oslo.cache==1.29.0
70oslo.concurrency==3.26.0 70oslo.concurrency==3.26.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 21f6e85..14c0c02 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -15,7 +15,7 @@ testscenarios>=0.4 # Apache-2.0/BSD
15unittest2>=1.1.0 # BSD 15unittest2>=1.1.0 # BSD
16pylint==1.4.5 # GPLv2 16pylint==1.4.5 # GPLv2
17requests>=2.14.2 # Apache-2.0 17requests>=2.14.2 # Apache-2.0
18os-testr>=1.0.0 # Apache-2.0 18stestr>=1.0.0 # Apache-2.0
19murano-pkg-check>=0.3.0 # Apache-2.0 19murano-pkg-check>=0.3.0 # Apache-2.0
20bandit>=1.1.0 # Apache-2.0 20bandit>=1.1.0 # Apache-2.0
21 21
diff --git a/tools/pretty_tox.sh b/tools/pretty_tox.sh
deleted file mode 100755
index c5a62e3..0000000
--- a/tools/pretty_tox.sh
+++ /dev/null
@@ -1,6 +0,0 @@
1#!/usr/bin/env bash
2
3set -o pipefail
4
5TESTRARGS=$1
6python setup.py testr --slowest --testr-args="--subunit $TESTRARGS" | python $(which subunit-trace) -f
diff --git a/tox.ini b/tox.ini
index 1e92be1..01a515e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,7 +13,7 @@ passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
13deps = -r{toxinidir}/requirements.txt 13deps = -r{toxinidir}/requirements.txt
14 -r{toxinidir}/test-requirements.txt 14 -r{toxinidir}/test-requirements.txt
15commands = rm -f .testrepository/times.dbm 15commands = rm -f .testrepository/times.dbm
16 bash tools/pretty_tox.sh '{posargs}' 16 stestr run {posargs}
17whitelist_externals = bash 17whitelist_externals = bash
18 find 18 find
19 rm 19 rm