build: adapt merge-junit-results to latest pytest/3 <testsuites> element

tox: allow latest pytest
2019-10-02 08:16:19 +02:00 · 2019-10-01 23:59:00 +02:00
2 changed files with 3 additions and 1 deletions
--- a/merge-junit-results.py
+++ b/merge-junit-results.py
@ -36,6 +36,8 @@ def merge_results(xml_files):
    for file_name in xml_files:
        tree = ET.parse(file_name)
        test_suite = tree.getroot()
+        if test_suite.tag == 'testsuites':
+            test_suite = test_suite.getchildren()[0]
        failures += int(test_suite.attrib['failures'])
        tests += int(test_suite.attrib['tests'])
        errors += int(test_suite.attrib['errors'])
--- a/tox.ini
+++ b/tox.ini
@ -20,7 +20,7 @@ deps =
  pg: psycopg2
  mock
  httmock
-  pytest<4.1
+  pytest
  pytest-cov
  pytest-random
  pytest-mock
Author	SHA1	Message	Date
Frédéric Péters	9da1c16c90	build: adapt merge-junit-results to latest pytest/3 <testsuites> element gitea/django-mellon/pipeline/head Build started... Details	2019-10-02 08:16:19 +02:00
Frédéric Péters	bca13e37ef	tox: allow latest pytest	2019-10-01 23:59:00 +02:00