Browse Source

Merge "Switch to using stestr"

Zuul 8 months ago
parent
commit
9d07f5b20a
6 changed files with 10 additions and 9 deletions
  1. 4
    1
      .gitignore
  2. 3
    0
      .stestr.conf
  3. 0
    7
      .testr.conf
  4. 1
    0
      lower-constraints.txt
  5. 1
    0
      test-requirements.txt
  6. 1
    1
      tox.ini

+ 4
- 1
.gitignore View File

@@ -56,4 +56,7 @@ ChangeLog
56 56
 .*sw?
57 57
 
58 58
 # Files created by releasenotes build
59
-releasenotes/build
59
+releasenotes/build
60
+
61
+!/.stestr.conf
62
+.stestr/

+ 3
- 0
.stestr.conf View File

@@ -0,0 +1,3 @@
1
+[DEFAULT]
2
+test_path=${OS_TEST_PATH:-./muranopkgcheck/tests}
3
+top_dir=./

+ 0
- 7
.testr.conf View File

@@ -1,7 +0,0 @@
1
-[DEFAULT]
2
-test_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
6
-test_id_option=--load-list $IDFILE
7
-test_list_option=--list

+ 1
- 0
lower-constraints.txt View File

@@ -40,6 +40,7 @@ snowballstemmer==1.2.1
40 40
 Sphinx==1.6.5
41 41
 sphinxcontrib-websupport==1.0.1
42 42
 stevedore==1.20.0
43
+stestr==1.0.0
43 44
 testrepository==0.0.18
44 45
 testscenarios==0.4
45 46
 testtools==2.2.0

+ 1
- 0
test-requirements.txt View File

@@ -12,6 +12,7 @@ oslotest>=3.2.0 # Apache-2.0
12 12
 testrepository>=0.0.18 # Apache-2.0/BSD
13 13
 testscenarios>=0.4 # Apache-2.0/BSD
14 14
 testtools>=2.2.0 # MIT
15
+stestr>=1.0.0 # Apache-2.0
15 16
 
16 17
 # releasenotes
17 18
 reno>=2.5.0 # Apache-2.0

+ 1
- 1
tox.ini View File

@@ -14,7 +14,7 @@ deps =
14 14
     -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
15 15
     -r{toxinidir}/requirements.txt
16 16
     -r{toxinidir}/test-requirements.txt
17
-commands = python setup.py test --slowest --testr-args='{posargs}'
17
+commands = stestr run {posargs}
18 18
 
19 19
 [testenv:pep8]
20 20
 basepython = python3

Loading…
Cancel
Save