Merge pull request #35 from zopefoundation/fix-tox-coverage

Ignore sys.argv in tests

.coveragerc

@@ -1,6 +1,16 @@
 [run]
+# This is not as helpful as it may seem, because the parent directory is
+# likely also named ZConfig, so this matches things like
+# /path/to/ZConfig/.tox/py*/lib/*
 source = ZConfig
 
+# datatypes.py is dynamically-created in a temporary directory and then
+# removed, which makes coverage reporting unhappy.
+omit =
+  */datatypes.py
+  .tox/*
+  ZConfig/tests/*
+
 [report]
 # Coverage is run on Py2 and Py3
 # on POSIX platforms, so omit Windows-specific

.gitignore

@@ -11,3 +11,5 @@ parts/
 doc/_build
 htmlcov/
 .coverage
+coverage.xml
+nosetests.xml

ZConfig/schema2html.py

@@ -86,7 +86,7 @@ class HtmlSchemaPrinter(AbstractSchemaPrinter):
     _schema_formatter = HtmlSchemaFormatter
 
 def main(argv=None):
-    argv = argv or sys.argv[1:]
+    argv = argv if argv is not None else sys.argv[1:]
 
     argparser = argparse.ArgumentParser(
         description="Print an HTML version of a schema")

ZConfig/tests/test_schema2html.py

@@ -74,10 +74,6 @@ def run_transform_rst(*args):
 
 class TestSchema2HTML(unittest.TestCase):
 
-    def test_no_schema(self):
-        self.assertRaises(SystemExit,
-                          run_transform)
-
     def test_schema_only(self):
         res = run_transform(input_file('simple.xml'))
         self.assertIn('</html>', res.getvalue())

tox.ini

@@ -12,13 +12,8 @@ deps =
 basepython =
     python2.7
 commands =
-#   The installed version messes up nose's test discovery / coverage reporting
-#   So, we uninstall that from the environment, and then install the editable
-#   version, before running nosetests.
-    pip uninstall -y ZConfig
-    pip install -e .
-    nosetests --with-xunit --with-xcoverage
+    coverage run setup.py -q test -q
+    coverage report -m
 deps =
-    nose
     coverage
-    nosexcover
+    {[testenv]deps}