Browse Source

Replace ostestr with stestr in testing framework.

A system upgrade broke ostestr. We can fix it by just calling stestr
directly.

Change-Id: Ib4948bc555ec1c301039165703eefda33760e33c
changes/39/641839/1
Pete Vander Giessen 6 months ago
parent
commit
91fe7bd6a5
4 changed files with 6 additions and 11 deletions
  1. 3
    0
      .stestr.conf
  2. 0
    8
      .testr.conf
  3. 1
    1
      test-requirements.txt
  4. 2
    2
      tox.ini

+ 3
- 0
.stestr.conf View File

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

+ 0
- 8
.testr.conf View File

@@ -1,8 +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 ./ ./unit_tests $LISTOPT $IDOPTION
6
-
7
-test_id_option=--load-list $IDFILE
8
-test_list_option=--list

+ 1
- 1
test-requirements.txt View File

@@ -5,7 +5,7 @@ charm-tools>=2.4.4
5 5
 coverage>=3.6
6 6
 mock>=1.2
7 7
 flake8>=2.2.4,<=2.4.1
8
-os-testr>=0.4.1
8
+stestr>=2.2.0
9 9
 requests>=2.18.4
10 10
 # BEGIN: Amulet OpenStack Charm Helper Requirements
11 11
 # Liberty client lower constraints

+ 2
- 2
tox.ini View File

@@ -12,7 +12,7 @@ setenv = VIRTUAL_ENV={envdir}
12 12
          AMULET_SETUP_TIMEOUT=5400
13 13
 install_command =
14 14
   pip install {opts} {packages}
15
-commands = ostestr {posargs}
15
+commands = stestr run {posargs}
16 16
 whitelist_externals = juju
17 17
 passenv = HOME TERM AMULET_* CS_API_*
18 18
 
@@ -50,7 +50,7 @@ setenv =
50 50
     PYTHON=coverage run
51 51
 commands =
52 52
     coverage erase
53
-    ostestr {posargs}
53
+    stestr run {posargs}
54 54
     coverage combine
55 55
     coverage html -d cover
56 56
     coverage xml -o cover/coverage.xml

Loading…
Cancel
Save