Merge pull request #246 from cdent/use-stestr

Switch to using stestr instead of testrepository

.gitignore

@@ -10,6 +10,7 @@ AUTHORS
 ChangeLog
 # Generated by testrepository
 .testrepository
+.stestr
 .idea
 .cache/
 # coverage related

.testr.conf → .stestr.conf

@@ -1,4 +1,5 @@
 [DEFAULT]
+test_path=gabbi/tests
 test_command=${PYTHON:-python} -m subunit.run discover gabbi $LISTOPT $IDOPTION
 test_id_option=--load-list $IDFILE
 test_list_option=--list

.travis.yml

@@ -37,12 +37,12 @@ matrix:
           env: TOXENV=py35
         - python: 3.5
           env: TOXENV=py35-pytest
-        - python: 3.5
-          env: TOXENV=py35-failskip
-        - python: 3.5
-          env: TOXENV=py35-limit
-        - python: 3.5
-          env: TOXENV=py35-prefix
+        - python: 3.6
+          env: TOXENV=py36-failskip
+        - python: 3.6
+          env: TOXENV=py36-limit
+        - python: 3.6
+          env: TOXENV=py36-prefix
         - python: 3.6
           env: TOXENV=py36
         - python: 3.6

test-failskip.sh

@@ -16,9 +16,9 @@ GREP_UXSUC_MATCH='unexpected successes=1'
 # run the live tests.
 PYTEST_MATCH="$SKIP skipped, $FAILS xfailed"
 
-python setup.py testr && \
+stestr run && \
     for match in "${GREP_FAIL_MATCH}" "${GREP_UXSUC_MATCH}" "${GREP_SKIP_MATCH}"; do
-        testr last --subunit | subunit2pyunit 2>&1 | \
+        stestr last --subunit | subunit2pyunit 2>&1 | \
             grep "${match}"
     done
 

test-limit.sh

@@ -7,9 +7,9 @@
 # broke limiting tests and we never knew.
 
 GREP_TEST_MATCH='tests.test_intercept.self_checklimit.test_request ... ok'
-GREP_COUNT_MATCH='Ran 1 '
+GREP_COUNT_MATCH='Ran: 1 '
 
-python setup.py testr --testr-args="checklimit" && \
-    testr last --subunit | subunit2pyunit 2>&1 | \
+stestr run "checklimit" && \
+    stestr last --subunit | subunit2pyunit 2>&1 | \
     grep "${GREP_TEST_MATCH}" && \
-    testr last | grep "${GREP_COUNT_MATCH}"
+    stestr last | grep "${GREP_COUNT_MATCH}"

test-requirements.txt

@@ -1,5 +1,5 @@
 mock ; python_version < '3.3'
-testrepository
+stestr
 coverage
 pytest-cov
 hacking

tox.ini

@@ -1,7 +1,7 @@
 [tox]
 minversion = 1.6
 skipsdist = True
-envlist = py27,py34,py35,py36,pypy,pep8,limit,failskip,docs,py35-prefix,py35-limit,py35-failskip,py27-pytest,py35-pytest,py36-pytest
+envlist = py27,py34,py35,py36,pypy,pep8,limit,failskip,docs,py36-prefix,py36-limit,py36-failskip,py27-pytest,py35-pytest,py36-pytest
 
 [testenv]
 deps = -r{toxinidir}/requirements.txt
@@ -10,7 +10,7 @@ whitelist_externals = rm
 install_command = pip install -U {opts} {packages}
 commands =
     rm -f .testrepository/times.dbm
-    python setup.py testr --testr-args="{posargs}"
+    stestr run {posargs}
 setenv = GABBI_PREFIX=
 passenv = GABBI_* HOME
 
@@ -28,7 +28,7 @@ commands = py.test gabbi
 [testenv:py36-pytest]
 commands = py.test gabbi
 
-[testenv:py35-prefix]
+[testenv:py36-prefix]
 setenv = GABBI_PREFIX=/snoopy
 
 [testenv:pep8]
@@ -42,14 +42,22 @@ commands = {toxinidir}/test-limit.sh
 [testenv:failskip]
 commands = {toxinidir}/test-failskip.sh
 
-[testenv:py35-limit]
+[testenv:py36-limit]
 commands = {toxinidir}/test-limit.sh
 
-[testenv:py35-failskip]
+[testenv:py36-failskip]
 commands = {toxinidir}/test-failskip.sh
 
 [testenv:cover]
-commands = python setup.py testr --coverage --testr-args="{posargs}"
+setenv = PYTHON=coverage run --source gabbi --parallel-mode
+commands =
+    coverage erase
+    find . -type f -name "*.pyc" -delete
+    stestr run {posargs}
+    coverage combine
+    coverage html -d cover
+    coverage xml -o cover/coverage.xml
+    coverage report
 
 [testenv:pytest-cov]
 commands = py.test --cov=gabbi gabbi/tests --cov-config .coveragerc --cov-report html