Browse Source

Merge "Switch to stestr"

Zuul 5 months ago
parent
commit
f83a1e50a4
5 changed files with 7 additions and 13 deletions
  1. 1
    1
      .gitignore
  2. 4
    0
      .stestr.conf
  3. 0
    9
      .testr.conf
  4. 1
    1
      requirements.txt
  5. 1
    2
      tox.ini

+ 1
- 1
.gitignore View File

@@ -15,7 +15,7 @@ coverage.xml
15 15
 *.py[co]
16 16
 .DS_Store
17 17
 *.log
18
-.testrepository
18
+.stestr/
19 19
 subunit.log
20 20
 .eggs
21 21
 AUTHORS

+ 4
- 0
.stestr.conf View File

@@ -0,0 +1,4 @@
1
+[DEFAULT]
2
+test_path=./tests
3
+top_dir=./
4
+

+ 0
- 9
.testr.conf View File

@@ -1,9 +0,0 @@
1
-[DEFAULT]
2
-test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
3
-             OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
4
-             OS_LOG_CAPTURE=${OS_LOG_CAPTURE:-1} \
5
-             ${PYTHON:-python} -m subunit.run discover -s ${OS_TEST_PATH:-./tests/} -t . $LISTOPT $IDOPTION
6
-
7
-test_id_option=--load-list $IDFILE
8
-test_list_option=--list
9
-group_regex=([^\.]+\.)+

+ 1
- 1
requirements.txt View File

@@ -1,6 +1,6 @@
1 1
 oslosphinx>=4.7.0  # Apache-2.0
2 2
 pbr>=1.8  # Apache-2.0
3 3
 sphinx>=1.2.1,!=1.3b1,<1.4  # BSD
4
-testrepository>=0.0.18  # Apache-2.0/BSD
4
+stestr>=2.0.0 # Apache-2.0
5 5
 testtools>=1.4.0  # MIT
6 6
 yasfb>=0.5.1

+ 1
- 2
tox.ini View File

@@ -10,9 +10,8 @@ install_command = pip install -U {opts} {packages}
10 10
 deps = -r{toxinidir}/requirements.txt
11 11
 whitelist_externals = find
12 12
 commands =
13
-  rm -f .testrepository
14 13
   find . -type f -name "*.pyc" -delete
15
-  python setup.py testr --slowest --testr-args='{posargs}'
14
+  stestr run --slowest {posargs}
16 15
 
17 16
 [testenv:venv]
18 17
 basepython = python3

Loading…
Cancel
Save