diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | .stestr.conf | 4 | ||||
| -rw-r--r-- | .testr.conf | 5 | ||||
| -rw-r--r-- | README.rst | 4 | ||||
| -rw-r--r-- | lower-constraints.txt | 2 | ||||
| -rw-r--r-- | test-requirements.txt | 2 | ||||
| -rw-r--r-- | tox.ini | 6 |
7 files changed, 12 insertions, 13 deletions
@@ -25,7 +25,7 @@ pip-log.txt # Unit test / coverage reports .coverage .tox -.testrepository +.stestr/ flake8.log cover diff --git a/.stestr.conf b/.stestr.conf new file mode 100644 index 0000000..d4ba6b9 --- /dev/null +++ b/.stestr.conf @@ -0,0 +1,4 @@ +[DEFAULT] +test_path=./barbicanclient/tests +top_dir=./ + diff --git a/.testr.conf b/.testr.conf deleted file mode 100644 index 3927088..0000000 --- a/.testr.conf +++ /dev/null @@ -1,5 +0,0 @@ -[DEFAULT] -test_command=${PYTHON:-python} -m subunit.run discover -s ./barbicanclient -t . $LISTOPT $IDOPTION - -test_id_option=--load-list $IDFILE -test_list_option=--list @@ -5,10 +5,6 @@ python-barbicanclient :target: https://pypi.org/project/python-barbicanclient/ :alt: Latest Version -.. image:: https://img.shields.io/pypi/dm/python-barbicanclient.svg - :target: https://pypi.org/project/python-barbicanclient/ - :alt: Downloads - This is a client for the `Barbican <https://github.com/openstack/barbican>`__ Key Management API. There is a Python library for accessing the API (`barbicanclient` module), and a command-line script (`barbican`). diff --git a/lower-constraints.txt b/lower-constraints.txt index 7876b87..9a616b8 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -65,7 +65,7 @@ rfc3986==0.3.1 simplejson==3.5.1 six==1.10.0 stevedore==1.20.0 -testrepository==0.0.18 +stestr==2.0.0 testtools==2.2.0 traceback2==1.4.0 unittest2==1.1.0 diff --git a/test-requirements.txt b/test-requirements.txt index 71f8127..0426a1e 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -6,7 +6,7 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 fixtures>=3.0.0 # Apache-2.0/BSD requests-mock>=1.2.0 # Apache-2.0 mock>=2.0.0 # BSD -testrepository>=0.0.18 # Apache-2.0/BSD +stestr>=2.0.0 # Apache-2.0 testtools>=2.2.0 # MIT oslotest>=3.2.0 # Apache-2.0 nose>=1.3.7 # LGPL @@ -7,6 +7,7 @@ skipsdist = True usedevelop = True install_command = pip install {opts} {packages} setenv = + PYTHON=coverage run --source barbicanclient --parallel-mode VIRTUAL_ENV={envdir} deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} @@ -16,7 +17,10 @@ deps = commands = rm -f .testrepository/times.dbm coverage erase - python setup.py testr --coverage --testr-args='{posargs}' + stestr run '{posargs}' + coverage combine + coverage html -d cover + coverage xml -o cover/coverage.xml coverage report -m [testenv:debug] |