summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPete Vander Giessen <pete.vandergiessen@canonical.com>2019-03-07 17:13:12 -0500
committerPete Vander Giessen <pete.vandergiessen@canonical.com>2019-03-07 17:13:16 -0500
commitdf39cd66d71b7be420d9ad0131926f3ccca4c100 (patch)
tree406c11f86a48cf82915f96d968dbe950d02a8b08
parent976391951e6a50011c6db34757b71282f13d502c (diff)
Replace ostestr with stestr in testing framework.HEADmaster
A system upgrade broke ostestr. We can fix it by just calling stestr directly. Change-Id: Iaa340623e414929cfa10897972bdb40d8bb39724
Notes
Notes (review): Verified+1: Canonical CI <uosci-testing-bot@ubuntu.com> Code-Review+1: zhangyoulin <zhangyl@awcloud.com> Code-Review+2: David Ames <david.ames@canonical.com> Workflow+1: David Ames <david.ames@canonical.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Fri, 08 Mar 2019 17:09:54 +0000 Reviewed-on: https://review.openstack.org/641848 Project: openstack/charm-swift-storage Branch: refs/heads/master
-rw-r--r--.stestr.conf3
-rw-r--r--.testr.conf8
-rw-r--r--test-requirements.txt2
-rw-r--r--tox.ini4
4 files changed, 6 insertions, 11 deletions
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..5fcccac
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
1[DEFAULT]
2test_path=./unit_tests
3top_dir=./
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index 801646b..0000000
--- a/.testr.conf
+++ /dev/null
@@ -1,8 +0,0 @@
1[DEFAULT]
2test_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
7test_id_option=--load-list $IDFILE
8test_list_option=--list
diff --git a/test-requirements.txt b/test-requirements.txt
index 2b2c0e1..272ce1d 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,7 +5,7 @@ charm-tools>=2.4.4
5coverage>=3.6 5coverage>=3.6
6mock>=1.2 6mock>=1.2
7flake8>=2.2.4,<=2.4.1 7flake8>=2.2.4,<=2.4.1
8os-testr>=0.4.1 8stestr>=2.2.0
9requests>=2.18.4 9requests>=2.18.4
10# BEGIN: Amulet OpenStack Charm Helper Requirements 10# BEGIN: Amulet OpenStack Charm Helper Requirements
11# Liberty client lower constraints 11# Liberty client lower constraints
diff --git a/tox.ini b/tox.ini
index e3115b6..b0596f5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,7 +13,7 @@ setenv = VIRTUAL_ENV={envdir}
13 AMULET_SETUP_TIMEOUT=5400 13 AMULET_SETUP_TIMEOUT=5400
14install_command = 14install_command =
15 pip install {opts} {packages} 15 pip install {opts} {packages}
16commands = ostestr {posargs} 16commands = stestr run {posargs}
17whitelist_externals = juju 17whitelist_externals = juju
18passenv = HOME TERM AMULET_* CS_API_* 18passenv = HOME TERM AMULET_* CS_API_*
19 19
@@ -49,7 +49,7 @@ setenv =
49 PYTHON=coverage run 49 PYTHON=coverage run
50commands = 50commands =
51 coverage erase 51 coverage erase
52 ostestr {posargs} 52 stestr run {posargs}
53 coverage combine 53 coverage combine
54 coverage html -d cover 54 coverage html -d cover
55 coverage xml -o cover/coverage.xml 55 coverage xml -o cover/coverage.xml