diff options
| -rw-r--r-- | .zuul.yaml | 3 | ||||
| -rw-r--r-- | releasenotes/source/index.rst | 1 | ||||
| -rw-r--r-- | releasenotes/source/train.rst | 6 | ||||
| -rw-r--r-- | test-requirements.txt | 1 | ||||
| -rwxr-xr-x | tools/pretty_tox.sh | 16 | ||||
| -rw-r--r-- | tooz/locking.py | 5 | ||||
| -rw-r--r-- | tox.ini | 6 |
7 files changed, 15 insertions, 23 deletions
@@ -5,8 +5,7 @@ - lib-forward-testing-python3 - openstack-cover-jobs - openstack-python-jobs - - openstack-python36-jobs - - openstack-python37-jobs + - openstack-python3-train-jobs - periodic-stable-jobs - publish-openstack-docs-pti - release-notes-jobs-python3 diff --git a/releasenotes/source/index.rst b/releasenotes/source/index.rst index 573579a..ea9d794 100644 --- a/releasenotes/source/index.rst +++ b/releasenotes/source/index.rst @@ -6,6 +6,7 @@ :maxdepth: 1 unreleased + train stein rocky queens diff --git a/releasenotes/source/train.rst b/releasenotes/source/train.rst new file mode 100644 index 0000000..5839003 --- /dev/null +++ b/releasenotes/source/train.rst @@ -0,0 +1,6 @@ +========================== +Train Series Release Notes +========================== + +.. release-notes:: + :branch: stable/train diff --git a/test-requirements.txt b/test-requirements.txt index 77d9ee3..7f183d2 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -8,5 +8,4 @@ testtools>=1.4.0 # MIT coverage>=3.6 # Apache-2.0 fixtures>=3.0.0 # Apache-2.0/BSD pifpaf>=0.10.0 # Apache-2.0 -os-testr>=0.8.0 # Apache-2.0 stestr>=2.0.0 diff --git a/tools/pretty_tox.sh b/tools/pretty_tox.sh deleted file mode 100755 index 150d506..0000000 --- a/tools/pretty_tox.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash - -set -o pipefail - -TESTRARGS=$1 - -# --until-failure is not compatible with --subunit see: -# -# https://bugs.launchpad.net/testrepository/+bug/1411804 -# -# this work around exists until that is addressed -if [[ "$TESTARGS" =~ "until-failure" ]]; then - stestr run --slowest "$TESTRARGS" -else - stestr run --slowest --subunit "$TESTRARGS" | subunit-trace -f -fi diff --git a/tooz/locking.py b/tooz/locking.py index 7d7ec81..f4ae0f0 100644 --- a/tooz/locking.py +++ b/tooz/locking.py @@ -97,13 +97,16 @@ class Lock(object): raise tooz.NotImplemented @abc.abstractmethod - def acquire(self, blocking=True): + def acquire(self, blocking=True, shared=False): """Attempts to acquire the lock. :param blocking: If True, blocks until the lock is acquired. If False, returns right away. Otherwise, the value is used as a timeout value and the call returns maximum after this number of seconds. + :param shared: If False, the lock is exclusive. If True, the lock can + be shareable or raises ``NotImplemented`` if not + implemented. :returns: returns true if acquired (false if not) :rtype: bool """ @@ -1,6 +1,6 @@ [tox] minversion = 3.1.0 -envlist = py27,py36,py37,py{27,36}-{zookeeper,redis,sentinel,memcached,postgresql,mysql,consul,etcd,etcd3,etcd3gw},pep8 +envlist = py27,py37,py{27,36}-{zookeeper,redis,sentinel,memcached,postgresql,mysql,consul,etcd,etcd3,etcd3gw},pep8 [testenv] # We need to install a bit more than just `test-requirements' because those drivers have @@ -33,7 +33,7 @@ setenv = consul: TOOZ_TEST_DRIVERS = consul # NOTE(tonyb): This project has chosen to *NOT* consume upper-constraints.txt commands = - {toxinidir}/run-tests.sh {toxinidir}/tools/pretty_tox.sh "{posargs}" + {toxinidir}/run-tests.sh stestr run "{posargs}" {toxinidir}/run-examples.sh [testenv:py27] @@ -51,7 +51,7 @@ deps = {[testenv]deps} setenv = {[testenv]setenv} PYTHON=coverage run --source tooz --parallel-mode commands = - {toxinidir}/run-tests.sh {toxinidir}/tools/pretty_tox.sh "{posargs}" + {toxinidir}/run-tests.sh stestr run "{posargs}" {toxinidir}/run-examples.sh coverage combine coverage html -d cover |