summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVu Cong Tuan <tuanvc@vn.fujitsu.com>2018-07-10 16:58:11 +0700
committerVu Cong Tuan <tuanvc@vn.fujitsu.com>2018-07-10 17:24:23 +0700
commit08fda6ea42bf355bc087bf99883b588e80952d37 (patch)
tree804bd8237af655cff3e54dda3ad6cd1af4bab880
parentd8cd0ceee7746b9fe5468b239784b3509b7c47bc (diff)
Switch to stestrHEADmaster
According to Openstack summit session [1], stestr is maintained project to which all Openstack projects should migrate. Let's switch to stestr as other projects have already moved to it. [1] https://etherpad.openstack.org/p/YVR-python-pti Change-Id: I532dc11528dfa1e9f566e3a2c860fd62a56418b3
Notes
Notes (review): Code-Review+2: zhurong <aaronzhu1121@gmail.com> Workflow+1: zhurong <aaronzhu1121@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Mon, 16 Jul 2018 00:55:55 +0000 Reviewed-on: https://review.openstack.org/581300 Project: openstack/murano-agent Branch: refs/heads/master
-rw-r--r--.gitignore2
-rw-r--r--.stestr.conf4
-rwxr-xr-x.testr.conf7
-rw-r--r--lower-constraints.txt2
-rw-r--r--requirements.txt28
-rw-r--r--test-requirements.txt18
-rw-r--r--tox.ini2
7 files changed, 30 insertions, 33 deletions
diff --git a/.gitignore b/.gitignore
index 4cb1549..722011d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,7 +40,7 @@ ChangeLog
40 40
41#Autogenerated sample config file 41#Autogenerated sample config file
42etc/muranoagent/muranoagent.conf.sample 42etc/muranoagent/muranoagent.conf.sample
43/.testrepository/ 43.stestr/
44 44
45#swap file 45#swap file
46*.swp 46*.swp
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..0a8cbfe
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,4 @@
1[DEFAULT]
2test_path=./muranoagent/tests/unit
3top_dir=./
4
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100755
index 4da4d7d..0000000
--- a/.testr.conf
+++ /dev/null
@@ -1,7 +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 $DISCOVER_DIRECTORY $LISTOPT $IDOPTION
6test_id_option=--load-list $IDFILE
7test_list_option=--list
diff --git a/lower-constraints.txt b/lower-constraints.txt
index dee1dbb..56f1cd2 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -75,7 +75,7 @@ snowballstemmer==1.2.1
75Sphinx==1.6.5 75Sphinx==1.6.5
76sphinxcontrib-websupport==1.0.1 76sphinxcontrib-websupport==1.0.1
77stevedore==1.28.0 77stevedore==1.28.0
78testrepository==0.0.20 78stestr==2.0.0
79testtools==2.3.0 79testtools==2.3.0
80traceback2==1.4.0 80traceback2==1.4.0
81unittest2==1.1.0 81unittest2==1.1.0
diff --git a/requirements.txt b/requirements.txt
index 2e343e2..6e8a03a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,17 +1,17 @@
1# The order of packages is significant, because pip processes them in the order 1# The order of packages is significant, because pip processes them in the order
2# of appearance. Changing the order has an impact on the overall integration 2# of appearance. Changing the order has an impact on the overall integration
3# process, which may cause wedges in the gate later. 3# process, which may cause wedges in the gate later.
4pbr!=2.1.0 # Apache-2.0 4pbr>=3.1.1 # Apache-2.0
5anyjson # BSD 5anyjson>=0.3.3 # BSD
6eventlet!=0.18.3,!=0.20.1,!=0.21.0 # MIT 6eventlet>=0.20.0,!=0.20.1,!=0.21.0 # MIT
7GitPython # BSD License (3 clause) 7GitPython>=2.1.8 # BSD License (3 clause)
8kombu!=4.0.2 # BSD 8kombu>=4.1.0 # BSD
9oslo.config!=4.3.0,!=4.4.0 # Apache-2.0 9oslo.config>=5.2.0 # Apache-2.0
10oslo.log # Apache-2.0 10oslo.log>=3.37.0 # Apache-2.0
11oslo.service!=1.28.1 # Apache-2.0 11oslo.service>=1.30.0 # Apache-2.0
12oslo.utils # Apache-2.0 12oslo.utils>=3.36.0 # Apache-2.0
13PyYAML # MIT 13PyYAML>=3.12 # MIT
14six # MIT 14six>=1.11.0 # MIT
15semantic-version # BSD 15semantic-version>=2.6.0 # BSD
16requests # Apache-2.0 16requests>=2.18.4 # Apache-2.0
17cryptography!=2.0 # BSD/Apache-2.0 17cryptography>=2.1.4 # BSD/Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 07daa38..8e82374 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,14 +2,14 @@
2# of appearance. Changing the order has an impact on the overall integration 2# of appearance. Changing the order has an impact on the overall integration
3# process, which may cause wedges in the gate later. 3# process, which may cause wedges in the gate later.
4hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 4hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
5unittest2 # BSD 5unittest2>=1.1.0 # BSD
6coverage!=4.4 # Apache-2.0 6coverage>=4.5.1 # Apache-2.0
7mock # BSD 7mock>=2.0.0 # BSD
8testtools # MIT 8testtools>=2.3.0 # MIT
9testrepository # Apache-2.0/BSD 9stestr>=2.0.0 # Apache-2.0
10oslotest # Apache-2.0 10oslotest>=3.3.0 # Apache-2.0
11 11
12# doc build requirements 12# doc build requirements
13openstackdocstheme # Apache-2.0 13openstackdocstheme>=1.20.0 # Apache-2.0
14sphinx!=1.6.6,!=1.6.7 # BSD 14sphinx>=1.6.5,!=1.6.6,!=1.6.7 # BSD
15reno # Apache-2.0 15reno>=2.7.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index c6843ae..2f66272 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,7 +11,7 @@ install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstac
11deps = -r{toxinidir}/requirements.txt 11deps = -r{toxinidir}/requirements.txt
12 -r{toxinidir}/test-requirements.txt 12 -r{toxinidir}/test-requirements.txt
13commands = 13commands =
14 python setup.py testr --slowest --testr-args='{posargs}' 14 stestr run --slowest {posargs}
15 15
16whitelist_externals = bash 16whitelist_externals = bash
17 find 17 find