summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPete Vander Giessen <pete.vandergiessen@canonical.com>2019-03-07 17:10:29 -0500
committerPete Vander Giessen <pete.vandergiessen@canonical.com>2019-03-07 17:10:33 -0500
commitb53207d2fd648afd86ccf2d4c845c1785f12b70a (patch)
tree4dae7e3521fdc215d583f94de348976306f71af5
parentd26fabe67474930dcae0a5f04a745b2092f9558d (diff)
Replace ostestr with stestr in testing framework.
A system upgrade broke ostestr. We can fix it by just calling stestr directly. Change-Id: I238730d47f05ec18cc1efd7ab20b88a8c29a2858
Notes
Notes (review): Verified+1: Canonical CI <uosci-testing-bot@ubuntu.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 00:17:47 +0000 Reviewed-on: https://review.openstack.org/641821 Project: openstack/charm-ceph-proxy Branch: refs/heads/master
-rw-r--r--.stestr.conf3
-rw-r--r--.testr.conf8
-rw-r--r--test-requirements.txt2
-rw-r--r--tox.ini2
4 files changed, 5 insertions, 10 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 1adf5d1..68ab28e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,7 +12,7 @@ setenv = VIRTUAL_ENV={envdir}
12 AMULET_SETUP_TIMEOUT=5400 12 AMULET_SETUP_TIMEOUT=5400
13install_command = 13install_command =
14 pip install {opts} {packages} 14 pip install {opts} {packages}
15commands = ostestr {posargs} 15commands = stestr run {posargs}
16whitelist_externals = juju 16whitelist_externals = juju
17passenv = HOME TERM AMULET_* CS_API_* 17passenv = HOME TERM AMULET_* CS_API_*
18 18