summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore3
-rw-r--r--.stestr.conf3
-rw-r--r--lower-constraints.txt3
-rw-r--r--test-requirements.txt2
-rw-r--r--tox.ini7
5 files changed, 10 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore
index 963e589..e621e98 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,7 @@ cover/
27!.coveragerc 27!.coveragerc
28.tox 28.tox
29nosetests.xml 29nosetests.xml
30.stestr
30.testrepository 31.testrepository
31.venv 32.venv
32 33
@@ -55,4 +56,4 @@ ChangeLog
55.*sw? 56.*sw?
56 57
57# Files created by releasenotes build 58# Files created by releasenotes build
58releasenotes/build \ No newline at end of file 59releasenotes/build
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..2a3aabd
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
1[DEFAULT]
2test_path=./masakari/tests/unit
3top_dir=./
diff --git a/lower-constraints.txt b/lower-constraints.txt
index 2c6965c..9d79375 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -50,7 +50,6 @@ networkx==1.11
50openstackdocstheme==1.18.1 50openstackdocstheme==1.18.1
51os-api-ref==1.4.0 51os-api-ref==1.4.0
52os-client-config==1.29.0 52os-client-config==1.29.0
53os-testr==1.0.0
54oslo.cache==1.29.0 53oslo.cache==1.29.0
55oslo.concurrency==3.26.0 54oslo.concurrency==3.26.0
56oslo.config==5.2.0 55oslo.config==5.2.0
@@ -106,7 +105,7 @@ sqlalchemy-migrate==0.11.0
106SQLAlchemy==1.2.5 105SQLAlchemy==1.2.5
107sqlparse==0.2.4 106sqlparse==0.2.4
108statsd==3.2.2 107statsd==3.2.2
109stestr==2.0.0 108stestr==1.0.0
110stevedore==1.20.0 109stevedore==1.20.0
111taskflow==2.16.0 110taskflow==2.16.0
112Tempita==0.5.2 111Tempita==0.5.2
diff --git a/test-requirements.txt b/test-requirements.txt
index a9a41cb..adfcb42 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -14,7 +14,7 @@ openstackdocstheme>=1.18.1 # Apache-2.0
14os-api-ref>=1.4.0 # Apache-2.0 14os-api-ref>=1.4.0 # Apache-2.0
15oslosphinx>=4.7.0 # Apache-2.0 15oslosphinx>=4.7.0 # Apache-2.0
16oslotest>=3.2.0 # Apache-2.0 16oslotest>=3.2.0 # Apache-2.0
17os-testr>=1.0.0 # Apache-2.0 17stestr>=1.0.0 # Apache-2.0
18requests-mock>=1.2.0 # Apache-2.0 18requests-mock>=1.2.0 # Apache-2.0
19testrepository>=0.0.18 # Apache-2.0/BSD 19testrepository>=0.0.18 # Apache-2.0/BSD
20testresources>=2.0.0 # Apache-2.0/BSD 20testresources>=2.0.0 # Apache-2.0/BSD
diff --git a/tox.ini b/tox.ini
index c45b83b..4ca91a5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,7 +7,6 @@ skipsdist = True
7usedevelop = True 7usedevelop = True
8install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} 8install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
9setenv = VIRTUAL_ENV={envdir} 9setenv = VIRTUAL_ENV={envdir}
10 OS_TEST_PATH=./masakari/tests/unit
11 LANGUAGE=en_US 10 LANGUAGE=en_US
12 LC_ALL=en_US.utf-8 11 LC_ALL=en_US.utf-8
13deps = -r{toxinidir}/test-requirements.txt 12deps = -r{toxinidir}/test-requirements.txt
@@ -15,7 +14,7 @@ whitelist_externals = bash
15 find 14 find
16 rm 15 rm
17 env 16 env
18# By default ostestr will set concurrency 17# By default stestr will set concurrency
19# to ncpu, to specify something else use 18# to ncpu, to specify something else use
20# the concurrency=<n> option. 19# the concurrency=<n> option.
21# call ie: 'tox -epy27 -- --concurrency=4' 20# call ie: 'tox -epy27 -- --concurrency=4'
@@ -27,12 +26,12 @@ passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY OS_DEB
27[testenv:py27] 26[testenv:py27]
28commands = 27commands =
29 {[testenv]commands} 28 {[testenv]commands}
30 ostestr '{posargs}' 29 stestr run {posargs}
31 30
32[testenv:py35] 31[testenv:py35]
33commands = 32commands =
34 {[testenv]commands} 33 {[testenv]commands}
35 ostestr '{posargs}' 34 stestr run {posargs}
36 35
37[testenv:genconfig] 36[testenv:genconfig]
38commands = oslo-config-generator --config-file=etc/masakari/masakari-config-generator.conf 37commands = oslo-config-generator --config-file=etc/masakari/masakari-config-generator.conf