diff -Nru pyjunitxml-0.6/debian/changelog pyjunitxml-0.6/debian/changelog --- pyjunitxml-0.6/debian/changelog 2017-07-26 09:18:56.000000000 +0000 +++ pyjunitxml-0.6/debian/changelog 2017-10-17 09:21:44.000000000 +0000 @@ -1,3 +1,14 @@ +pyjunitxml (0.6-1.3) unstable; urgency=medium + + * Non-maintainer upload. + * Fix emission of skipped tests. (Closes: #874354) + * Add a Homepage field. (Closes: #787532) + * Rewrite long description. (Closes: #551313) + * Update d/copyright links to use https (policy 4.0.0). + * Declare compliance with policy version 4.1.1. + + -- Helmut Grohne Tue, 17 Oct 2017 11:21:44 +0200 + pyjunitxml (0.6-1.2) UNRELEASED; urgency=medium * Non-maintainer upload. diff -Nru pyjunitxml-0.6/debian/control pyjunitxml-0.6/debian/control --- pyjunitxml-0.6/debian/control 2013-08-28 18:28:49.000000000 +0000 +++ pyjunitxml-0.6/debian/control 2017-10-17 09:21:44.000000000 +0000 @@ -7,18 +7,25 @@ python3-all, dh-python Build-Depends-Indep: subunit (>= 0.0.2), python3-subunit -Standards-Version: 3.9.4 +Standards-Version: 4.1.1 X-Python-Version: >= 2.4 X-Python3-Version: >= 3.0 +Homepage: https://launchpad.net/pyjunitxml Package: python-junitxml Architecture: all Depends: ${python:Depends}, ${misc:Depends} Description: PyUnit extension for reporting in JUnit compatible XML - A PyUnit extension to output JUnit compatible XML. + junitxml is a Python module for recording test results from a stdlib unittest + runner in a JUnit compatible XML stream. + . + This package contains the junitxml module for Python 2.x. Package: python3-junitxml Architecture: all Depends: ${python3:Depends}, ${misc:Depends} Description: PyUnit extension for reporting in JUnit compatible XML - A PyUnit extension to output JUnit compatible XML. + junitxml is a Python module for recording test results from a stdlib unittest + runner in a JUnit compatible XML stream. + . + This package contains the junitxml module for Python 3.x. diff -Nru pyjunitxml-0.6/debian/copyright pyjunitxml-0.6/debian/copyright --- pyjunitxml-0.6/debian/copyright 2013-08-28 06:35:24.000000000 +0000 +++ pyjunitxml-0.6/debian/copyright 2017-10-17 09:21:44.000000000 +0000 @@ -1,6 +1,6 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Contact: Robert Collins -Source: http://launchpad.net/pyjunitxml/ +Source: https://launchpad.net/pyjunitxml/ Files: * Copyright: diff -Nru pyjunitxml-0.6/debian/patches/874354-skip.patch pyjunitxml-0.6/debian/patches/874354-skip.patch --- pyjunitxml-0.6/debian/patches/874354-skip.patch 1970-01-01 00:00:00.000000000 +0000 +++ pyjunitxml-0.6/debian/patches/874354-skip.patch 2017-10-17 09:21:44.000000000 +0000 @@ -0,0 +1,45 @@ +From: Helmut Grohne +Subject: fix formatting of skips +Bug-Debian: https://bugs.debian.org/874354 +Last-Update: 2017-10-17 + +http://llg.cubic.org/docs/junit/ + +A typical symptom is that consumers (such as Jenkins junit-plugin) treats skips +as successes. + +Index: pyjunitxml-0.6/junitxml/__init__.py +=================================================================== +--- pyjunitxml-0.6.orig/junitxml/__init__.py ++++ pyjunitxml-0.6/junitxml/__init__.py +@@ -198,7 +198,7 @@ class JUnitXmlResult(unittest.TestResult + pass + self._test_case_string(test) + self._results.append('>\n') +- self._results.append('%s\n\n'% _escape_attr(reason)) ++ self._results.append('%s\n\n'% _escape_attr(reason)) + + def addUnexpectedSuccess(self, test): + try: +Index: pyjunitxml-0.6/junitxml/tests/test_junitxml.py +=================================================================== +--- pyjunitxml-0.6.orig/junitxml/tests/test_junitxml.py ++++ pyjunitxml-0.6/junitxml/tests/test_junitxml.py +@@ -156,7 +156,7 @@ class TestJUnitXmlResult(unittest.TestCa + output = self.get_output() + expected = """ + +-yo ++yo + + + """ +@@ -263,7 +263,7 @@ class TestWellFormedXml(unittest.TestCas + doc = self._run_and_parse_test(SkipWithLt()) + if self.has_skip: + self.assertEqual('2.7 <= version', +- doc.getElementsByTagName("skip")[0].firstChild.nodeValue) ++ doc.getElementsByTagName("skipped")[0].firstChild.nodeValue) + else: + self.assertTrue( + doc.getElementsByTagName("failure")[0].firstChild.nodeValue diff -Nru pyjunitxml-0.6/debian/patches/series pyjunitxml-0.6/debian/patches/series --- pyjunitxml-0.6/debian/patches/series 2017-07-26 09:18:56.000000000 +0000 +++ pyjunitxml-0.6/debian/patches/series 2017-10-17 09:21:44.000000000 +0000 @@ -1 +1,2 @@ ftbfs-802124.patch +874354-skip.patch