summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Madden <jamadden@gmail.com>2017-06-09 15:49:04 -0500
committerJason Madden <jamadden@gmail.com>2017-06-09 15:49:04 -0500
commitb752e80b28439caa994663e16e16a1899b1dfc2c (patch)
tree2627b97f777042f14016ae17ee91ed324bd436c6
parent2f7070393e211f37418407f099b7526fc5aa8167 (diff)
downloadzope-interface-coverage.tar.gz
Convert tox to run the coverage command, like travis.coverage
Fixes #87
-rw-r--r--src/zope/interface/tests/test_adapter.py2
-rw-r--r--src/zope/interface/tests/test_advice.py6
-rw-r--r--src/zope/interface/tests/test_declarations.py4
-rw-r--r--tox.ini5
4 files changed, 8 insertions, 9 deletions
diff --git a/src/zope/interface/tests/test_adapter.py b/src/zope/interface/tests/test_adapter.py
index 12db38d..24c3334 100644
--- a/src/zope/interface/tests/test_adapter.py
+++ b/src/zope/interface/tests/test_adapter.py
@@ -1390,7 +1390,7 @@ class Test_utils(unittest.TestCase):
STR = b'str'
if sys.version_info[0] < 3:
self.assertEqual(_normalize_name(STR), unicode(STR))
- else:
+ else: # pragma: no cover (tox runs coverage on Python 2)
self.assertEqual(_normalize_name(STR), str(STR, 'ascii'))
def test__normalize_name_unicode(self):
diff --git a/src/zope/interface/tests/test_advice.py b/src/zope/interface/tests/test_advice.py
index 0739ac1..4c47e67 100644
--- a/src/zope/interface/tests/test_advice.py
+++ b/src/zope/interface/tests/test_advice.py
@@ -221,7 +221,7 @@ class Test_determineMetaclass(unittest.TestCase):
self.assertEqual(self._callFUT((Meta, type)), Metameta)
@_skip_under_py2
- def test_meta_of_class_py3k(self):
+ def test_meta_of_class_py3k(self): # pragma: no cover (tox runs coverage on Python 2)
# Work around SyntaxError under Python2.
EXEC = '\n'.join([
'class Metameta(type):',
@@ -249,7 +249,7 @@ class Test_determineMetaclass(unittest.TestCase):
self.assertEqual(self._callFUT((A, B,)), Meta_B)
@_skip_under_py2
- def test_multiple_in_hierarchy_py3k(self):
+ def test_multiple_in_hierarchy_py3k(self): # pragma: no cover (tox runs coverage on Python 2)
# Work around SyntaxError under Python2.
EXEC = '\n'.join([
'class Meta_A(type):',
@@ -282,7 +282,7 @@ class Test_determineMetaclass(unittest.TestCase):
self.assertRaises(TypeError, self._callFUT, (A, B,))
@_skip_under_py2
- def test_multiple_not_in_hierarchy_py3k(self):
+ def test_multiple_not_in_hierarchy_py3k(self): # pragma: no cover (tox runs coverage on Python 2)
# Work around SyntaxError under Python2.
EXEC = '\n'.join([
'class Meta_A(type):',
diff --git a/src/zope/interface/tests/test_declarations.py b/src/zope/interface/tests/test_declarations.py
index 5c992b3..b7a33d2 100644
--- a/src/zope/interface/tests/test_declarations.py
+++ b/src/zope/interface/tests/test_declarations.py
@@ -31,7 +31,7 @@ class _Py3ClassAdvice(object):
exec(code, globs, locs)
self.assertEqual(len(log), 0) # no longer warn
return True
- else:
+ else: # pragma: no cover (tox runs coverage on Python 2)
try:
exec(code, globs, locs)
except TypeError:
@@ -752,7 +752,7 @@ class Test_implementsOnly(unittest.TestCase, _Py3ClassAdvice):
warnings.resetwarnings()
try:
exec(CODE, globs, locs)
- except TypeError:
+ except TypeError: # pragma: no cover (tox runs coverage on Python 2)
if not PYTHON3:
raise
else:
diff --git a/tox.ini b/tox.ini
index e006ebb..608fa00 100644
--- a/tox.ini
+++ b/tox.ini
@@ -28,12 +28,11 @@ usedevelop = true
basepython =
python2.7
commands =
- nosetests --with-xunit --with-xcoverage {posargs}
+ coverage run setup.py -q test -q {posargs}
+ coverage report --skip-covered
deps =
{[testenv]deps}
- nose
coverage
- nosexcover
[testenv:docs]
basepython =