Convert tests to pytest style. Separate suite and case test modules. Break out test helpers. Fix flake8 issues. Fix formatting.

feffe · sysradium · commit c6c3c90db98d · 2019-07-30T11:02:38.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -19,6 +19,7 @@ env:
   - TOXENV=py27
   - TOXENV=py36
   - TOXENV=cover
+  - TOXENV=flake8
 
 install:
   - travis_retry pip install tox==3.13.2
diff --git a/asserts.py b/asserts.py
@@ -0,0 +1,62 @@
+
+
+def verify_test_case(
+        test_case_element,
+        expected_attributes,
+        error_message=None,
+        error_output=None,
+        error_type=None,
+        failure_message=None,
+        failure_output=None,
+        failure_type=None,
+        skipped_message=None,
+        skipped_output=None,
+        stdout=None,
+        stderr=None
+):
+    for k, v in expected_attributes.items():
+        assert test_case_element.attributes[k].value == v
+
+    for k in test_case_element.attributes.keys():
+        assert k in expected_attributes.keys()
+
+        if stderr:
+            assert test_case_element.getElementsByTagName('system-err')[0].firstChild.nodeValue.strip() == stderr
+        if stdout:
+            assert test_case_element.getElementsByTagName('system-out')[0].firstChild.nodeValue.strip() == stdout
+
+        errors = test_case_element.getElementsByTagName('error')
+        if error_message or error_output:
+            assert len(errors) > 0
+        else:
+            assert len(errors) == 0
+
+        if error_message:
+            assert errors[0].attributes['message'].value == error_message
+
+        if error_type and errors:
+            assert errors[0].attributes['type'].value == error_type
+
+        if error_output:
+            assert errors[0].firstChild.nodeValue.strip() == error_output
+
+        failures = test_case_element.getElementsByTagName('failure')
+        if failure_message or failure_output:
+            assert len(failures) > 0
+        else:
+            assert len(failures) == 0
+
+        if failure_message:
+            assert failures[0].attributes['message'].value == failure_message
+
+        if failure_type and failures:
+            assert failures[0].attributes['type'].value == failure_type
+
+        if failure_output:
+            assert failures[0].firstChild.nodeValue.strip() == failure_output
+
+        skipped = test_case_element.getElementsByTagName('skipped')
+        if skipped_message or skipped_output:
+            assert len(skipped) > 0
+        else:
+            assert len(skipped) == 0
diff --git a/junit_xml/__init__.py b/junit_xml/__init__.py
@@ -59,15 +59,15 @@ def decode(var, encoding):
     If not already unicode, decode it.
     """
     if PY2:
-        if isinstance(var, unicode):
+        if isinstance(var, unicode):  # NOQA
             ret = var
         elif isinstance(var, str):
             if encoding:
                 ret = var.decode(encoding)
             else:
-                ret = unicode(var)
+                ret = unicode(var)  # NOQA
         else:
-            ret = unicode(var)
+            ret = unicode(var)  # NOQA
     else:
         ret = str(var)
     return ret
diff --git a/serializer.py b/serializer.py
@@ -0,0 +1,53 @@
+import codecs
+import os
+import tempfile
+from xml.dom import minidom
+
+from six import PY2
+
+from junit_xml import TestSuite as Suite
+
+
+def serialize_and_read(test_suites, to_file=False, prettyprint=False, encoding=None):
+    """writes the test suite to an XML string and then re-reads it using minidom,
+       returning => (test suite element, list of test case elements)"""
+    try:
+        iter(test_suites)
+    except TypeError:
+        test_suites = [test_suites]
+
+    if to_file:
+        fd, filename = tempfile.mkstemp(text=True)
+        os.close(fd)
+        with codecs.open(filename, mode='w', encoding=encoding) as f:
+            Suite.to_file(f, test_suites, prettyprint=prettyprint, encoding=encoding)
+        print("Serialized XML to temp file [%s]" % filename)
+        xmldoc = minidom.parse(filename)
+        os.remove(filename)
+    else:
+        xml_string = Suite.to_xml_string(
+            test_suites, prettyprint=prettyprint, encoding=encoding)
+        if PY2:
+            assert isinstance(xml_string, unicode)  # NOQA
+        print("Serialized XML to string:\n%s" % xml_string)
+        if encoding:
+            xml_string = xml_string.encode(encoding)
+        xmldoc = minidom.parseString(xml_string)
+
+    def remove_blanks(node):
+        for x in node.childNodes:
+            if x.nodeType == minidom.Node.TEXT_NODE:
+                if x.nodeValue:
+                    x.nodeValue = x.nodeValue.strip()
+            elif x.nodeType == minidom.Node.ELEMENT_NODE:
+                remove_blanks(x)
+
+    remove_blanks(xmldoc)
+    xmldoc.normalize()
+
+    ret = []
+    suites = xmldoc.getElementsByTagName("testsuites")[0]
+    for suite in suites.getElementsByTagName("testsuite"):
+        cases = suite.getElementsByTagName("testcase")
+        ret.append((suite, cases))
+    return ret
diff --git a/setup.cfg b/setup.cfg
@@ -0,0 +1,3 @@
+[flake8]
+max-line-length = 120
+exclude = .git,.tox,build,dist,venv
diff --git a/setup.py b/setup.py
@@ -6,6 +6,7 @@
 def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read()
 
+
 setup(
     name='junit-xml',
     author='Brian Beyer',
diff --git a/test_junit_xml.py b/test_junit_xml.py
diff --git a/test_test_case.py b/test_test_case.py
diff --git a/test_test_suite.py b/test_test_suite.py

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[flake8]`
	`2`	`+max-line-length = 120`
	`3`	`+exclude = .git,.tox,build,dist,venv`