summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPete Vander Giessen <pete.vandergiessen@canonical.com>2019-03-07 17:11:46 -0500
committerPete Vander Giessen <pete.vandergiessen@canonical.com>2019-03-07 17:11:50 -0500
commit21335bc2110f27bec3849a1f52b7b11476e9a605 (patch)
tree2d44d9feabe2f31d9a7b9fcd45a8520cc10f211f
parent2996db663ffe78ef4754233f9ab565cc92551c9c (diff)
downloadcharm-nova-lxd-21335bc2110f27bec3849a1f52b7b11476e9a605.zip
charm-nova-lxd-21335bc2110f27bec3849a1f52b7b11476e9a605.tar.gz
charm-nova-lxd-21335bc2110f27bec3849a1f52b7b11476e9a605.tar.bz2
Replace ostestr with stestr in testing framework.
A system upgrade broke ostestr. We can fix it by just calling stestr directly. Change-Id: Ifcfd80384205072c3c195e2a1261e788be4d0cd6
-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 @@
+[DEFAULT]
+test_path=./unit_tests
+top_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 @@
-[DEFAULT]
-test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
- OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
- OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
- ${PYTHON:-python} -m subunit.run discover -t ./ ./unit_tests $LISTOPT $IDOPTION
-
-test_id_option=--load-list $IDFILE
-test_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
coverage>=3.6
mock>=1.2
flake8>=2.2.4,<=2.4.1
-os-testr>=0.4.1
+stestr>=2.2.0
requests>=2.18.4
# BEGIN: Amulet OpenStack Charm Helper Requirements
# Liberty client lower constraints
diff --git a/tox.ini b/tox.ini
index 0b72fa9..5786385 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,7 +12,7 @@ setenv = VIRTUAL_ENV={envdir}
AMULET_SETUP_TIMEOUT=5400
install_command =
pip install {opts} {packages}
-commands = ostestr {posargs}
+commands = stestr run {posargs}
whitelist_externals = juju
passenv = HOME TERM AMULET_* CS_API_*

This mirror site include all the OpenStack related repositories under: openstack, openstack-dev and openstack-infra.

NOTE: All repositories are updated every one hour.

Usage

For Git Clone
 git clone http://git.trystack.cn/openstack/nova.git 
For DevStack

Add GIT_BASE, NOVNC_REPO and SPICE_REPO variables to local.conf file.

[[local|localrc]]

# use TryStack git mirror
GIT_BASE=http://git.trystack.cn
NOVNC_REPO=http://git.trystack.cn/kanaka/noVNC.git
SPICE_REPO=http://git.trystack.cn/git/spice/spice-html5.git