From c3bee4928f8a9534d89781c1c655ea33e3e1ba62 Mon Sep 17 00:00:00 2001 From: Vu Cong Tuan Date: Wed, 4 Jul 2018 13:26:04 +0700 Subject: [PATCH] Switch to stestr 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: Icb8426985ea156ed8b5f4dd454ed8457c11ec2a0 --- .gitignore | 2 +- .stestr.conf | 4 ++++ .testr.conf | 4 ---- requirements.txt | 2 +- .../add-start-end-time-for-continuous-audit.rst | 13 +++++++------ specs/rocky/approved/watcher-planner-selector.rst | 8 ++++---- test-requirements.txt | 1 + tox.ini | 2 +- 8 files changed, 19 insertions(+), 17 deletions(-) create mode 100644 .stestr.conf delete mode 100644 .testr.conf diff --git a/.gitignore b/.gitignore index 04c41fe..3db6cc5 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,7 @@ build *.swp *.swo *.pyc -.testrepository +.stestr/ *.DS_Store #IntelliJ Idea .idea/ diff --git a/.stestr.conf b/.stestr.conf new file mode 100644 index 0000000..dcdf16e --- /dev/null +++ b/.stestr.conf @@ -0,0 +1,4 @@ +[DEFAULT] +test_path=./tests +top_dir=./ + diff --git a/.testr.conf b/.testr.conf deleted file mode 100644 index 1641f86..0000000 --- a/.testr.conf +++ /dev/null @@ -1,4 +0,0 @@ -[DEFAULT] -test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 OS_TEST_TIMEOUT=60 ${PYTHON:-python} -m subunit.run discover -t ./ . $LISTOPT $IDOPTION -test_id_option=--load-list $IDFILE -test_list_option=--list diff --git a/requirements.txt b/requirements.txt index 74e9502..8860800 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ oslosphinx pbr>=2.0.0,!=2.1.0 # Apache-2.0 sphinx>=1.6.2 # BSD -testrepository>=0.0.18 testtools>=1.4.0 +stestr>=2.0.0 yasfb>=0.5.1 doc8 # Apache-2.0 diff --git a/specs/rocky/approved/add-start-end-time-for-continuous-audit.rst b/specs/rocky/approved/add-start-end-time-for-continuous-audit.rst index 043b34c..fbb5f0e 100644 --- a/specs/rocky/approved/add-start-end-time-for-continuous-audit.rst +++ b/specs/rocky/approved/add-start-end-time-for-continuous-audit.rst @@ -10,7 +10,8 @@ Add the start and end time for CONTINUOUS audit https://blueprints.launchpad.net/watcher/+spec/add-start-end-time-for-continuous-audit -Currently we can only set audit execution interval, but we can not set audit start and end time. +Currently we can only set audit execution interval, but we can not set audit +start and end time. We need to add the audit start and end time for CONTINUOUS audit. @@ -33,11 +34,11 @@ Proposed change * For CONTINUOUS audit, if its state is PENDING or ONGOING, launch the audit only if the current time is between start_time and end_time -The user can specify the start and end time or any one, If user doesn't specify start and end time, -the audit's behavior is the same as before. If no start time, audit starts after creating. -If no end time, audit runs until its state is SUSPENDED or CANCELLED. -If end time is provided, the audit will be set from ONGOING to SUCCEEDED -after end time and not running again. +The user can specify the start and end time or any one, If user doesn't specify +start and end time, the audit's behavior is the same as before. If no start +time, audit starts after creating. If no end time, audit runs until its state +is SUSPENDED or CANCELLED. If end time is provided, the audit will be set from +ONGOING to SUCCEEDED after end time and not running again. The datetime format is ISO 8601, such as: YYYY-MM-DD hh:mm:ss Here are some CLI examples: diff --git a/specs/rocky/approved/watcher-planner-selector.rst b/specs/rocky/approved/watcher-planner-selector.rst index 016e3da..0e2400b 100644 --- a/specs/rocky/approved/watcher-planner-selector.rst +++ b/specs/rocky/approved/watcher-planner-selector.rst @@ -38,11 +38,11 @@ made by this Planner. Use Cases ---------- -* As an Strategy developer, I want to choose what Planner would be applied to the - Solution generated by my Strategy. +* As an Strategy developer, I want to choose what Planner would be applied to + the Solution generated by my Strategy. -* As an Strategy developer, I expect that if I provide no Planner to my Strategy, it - will use default Planner that is set in base Strategy.. +* As an Strategy developer, I expect that if I provide no Planner to my + Strategy, it will use default Planner that is set in base Strategy.. Proposed change diff --git a/test-requirements.txt b/test-requirements.txt index 86f503a..ef2a53d 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,3 +3,4 @@ # process, which may cause wedges in the gate later. hacking>=0.10.0,<0.11 +stestr>=2.0.0 # Apache-2.0 diff --git a/tox.ini b/tox.ini index fb126a5..911a5a1 100644 --- a/tox.ini +++ b/tox.ini @@ -13,7 +13,7 @@ deps = -r{toxinidir}/requirements.txt whitelist_externals = find commands = find . -type f -name "*.pyc" -delete - python setup.py testr --slowest --testr-args='{posargs}' + stestr run --slowest {posargs} [testenv:venv] commands = {posargs}