commit da48e5cf6ec1449443138716f23c78eab36b69ab
Author: Michael Simacek <msimacek(a)redhat.com>
Date: Wed Oct 2 10:23:46 2013 +0200
XML comparison output is not interleaved with test output
test/maven_depmap_test.py | 53 ++++++++++++++++++++++++++++-----------------
1 files changed, 33 insertions(+), 20 deletions(-)
---
diff --git a/test/maven_depmap_test.py b/test/maven_depmap_test.py
index 7a31f91..f2ecfc8 100644
--- a/test/maven_depmap_test.py
+++ b/test/maven_depmap_test.py
@@ -33,15 +33,13 @@ class TestMavenDepmap(unittest.TestCase):
except OSError:
pass
- def xml_compare_reporter(self, report):
- print report
-
def check_result(self, test_name, depmap):
got = etree.fromstring(depmap)
want = etree.parse(os.path.join(self.workdir,
test_name+"-want.xml")).getroot()
- res = doctest_xml_compare.xml_compare(got, want, self.xml_compare_reporter)
- return got, want, res
+ report = []
+ res = doctest_xml_compare.xml_compare(got, want, lambda x: report.append(x))
+ return got, want, res, report
def check_archive(self, test_name, archive_path, keep_comments=False):
with ZipFile(archive_path, 'r') as got:
@@ -65,15 +63,17 @@ class TestMavenDepmap(unittest.TestCase):
@mvn_depmap('JPP-bndlib.pom', 'usr/share/java/bndlib.jar')
def test_basic(self, stdout, stderr, return_value, depmap):
self.assertEqual(return_value, 0)
- got, want, res = self.check_result(inspect.currentframe().f_code.co_name,
+ got, want, res, report =
self.check_result(inspect.currentframe().f_code.co_name,
depmap)
+ self.assertEqual(report, [])
self.assertEqual(res, True)
@mvn_depmap('JPP-aqute-bndlib.pom',
'usr/share/java/aqute-bndlib.jar')
def test_different_artifactId(self, stdout, stderr, return_value, depmap):
self.assertEqual(return_value, 0)
- got, want, res = self.check_result(inspect.currentframe().f_code.co_name,
+ got, want, res, report =
self.check_result(inspect.currentframe().f_code.co_name,
depmap)
+ self.assertEqual(report, [])
self.assertEqual(res, True)
@mvn_depmap('JPP-commons-io.pom')
@@ -83,8 +83,9 @@ class TestMavenDepmap(unittest.TestCase):
@mvn_depmap('JPP-apache-commons-io.pom')
def test_packaging_pom_no_jar(self, stdout, stderr, return_value, depmap):
self.assertEqual(return_value, 0, stderr)
- got, want, res = self.check_result(inspect.currentframe().f_code.co_name,
+ got, want, res, report =
self.check_result(inspect.currentframe().f_code.co_name,
depmap)
+ self.assertEqual(report, [])
self.assertEqual(res, True)
@mvn_depmap('JPP-noversion.pom')
@@ -94,29 +95,33 @@ class TestMavenDepmap(unittest.TestCase):
@mvn_depmap('JPP-commons-war.pom', 'usr/share/java/commons-war.war')
def test_war(self, stdout, stderr, return_value, depmap):
self.assertEqual(return_value, 0, stderr)
- got, want, res = self.check_result(inspect.currentframe().f_code.co_name,
+ got, want, res, report =
self.check_result(inspect.currentframe().f_code.co_name,
depmap)
+ self.assertEqual(report, [])
self.assertEqual(res, True)
@mvn_depmap('JPP-commons-weird.pom',
'usr/share/java/commons-weird.war')
def test_weird_packaging(self, stdout, stderr, return_value, depmap):
self.assertEqual(return_value, 0, stderr)
- got, want, res = self.check_result(inspect.currentframe().f_code.co_name,
+ got, want, res, report =
self.check_result(inspect.currentframe().f_code.co_name,
depmap)
+ self.assertEqual(report, [])
self.assertEqual(res, True)
@mvn_depmap('JPP-packaging-pom.pom',
'usr/share/java/packaging-pom.jar')
def test_packaging_pom_and_jar(self, stdout, stderr, return_value, depmap):
self.assertEqual(return_value, 0, stderr)
- got, want, res = self.check_result(inspect.currentframe().f_code.co_name,
+ got, want, res, report =
self.check_result(inspect.currentframe().f_code.co_name,
depmap)
+ self.assertEqual(report, [])
self.assertEqual(res, True)
@mvn_depmap('JPP.commons-io-commons-io.pom',
'usr/share/java/commons-io/commons-io.jar')
def test_subdirectory(self, stdout, stderr, return_value, depmap):
self.assertEqual(return_value, 0, stderr)
- got, want, res = self.check_result(inspect.currentframe().f_code.co_name,
+ got, want, res, report =
self.check_result(inspect.currentframe().f_code.co_name,
depmap)
+ self.assertEqual(report, [])
self.assertEqual(res, True)
@mvn_depmap('JPP-commons-io-commons-io.pom',
'/usr/share/java/commons-io.jar')
@@ -130,57 +135,65 @@ class TestMavenDepmap(unittest.TestCase):
@mvn_depmap('a:b:12', 'usr/share/java/commons-io.jar')
def test_mvn_spec(self, stdout, stderr, return_value, depmap):
self.assertEqual(return_value, 0, stderr)
- got, want, res = self.check_result(inspect.currentframe().f_code.co_name,
+ got, want, res, report =
self.check_result(inspect.currentframe().f_code.co_name,
depmap)
+ self.assertEqual(report, [])
self.assertEqual(res, True)
@mvn_depmap('a:b:war::1', 'usr/share/java/commons-war.war')
def test_mvn_spec_war(self, stdout, stderr, return_value, depmap):
self.assertEqual(return_value, 0, stderr)
- got, want, res = self.check_result(inspect.currentframe().f_code.co_name,
+ got, want, res, report =
self.check_result(inspect.currentframe().f_code.co_name,
depmap)
+ self.assertEqual(report, [])
self.assertEqual(res, True)
@mvn_depmap('/builddir/build/BUILDROOT/pkg-2.5.2-2.fc21.x86_64/a:b:war::1',
'usr/share/java/commons-war.war')
def test_mvn_spec_buildroot(self, stdout, stderr, return_value, depmap):
self.assertEqual(return_value, 0, stderr)
- got, want, res = self.check_result(inspect.currentframe().f_code.co_name,
+ got, want, res, report =
self.check_result(inspect.currentframe().f_code.co_name,
depmap)
+ self.assertEqual(report, [])
self.assertEqual(res, True)
@mvn_depmap('a:b:12', 'usr/share/java/commons-io.jar', ['-a',
'x:y'])
def test_append(self, stdout, stderr, return_value, depmap):
self.assertEqual(return_value, 0, stderr)
- got, want, res = self.check_result(inspect.currentframe().f_code.co_name,
+ got, want, res, report =
self.check_result(inspect.currentframe().f_code.co_name,
depmap)
+ self.assertEqual(report, [])
self.assertEqual(res, True)
@mvn_depmap('a:b:12', 'usr/share/java/commons-io.jar', ['-a',
'x:y,z:w'])
def test_append_multiple(self, stdout, stderr, return_value, depmap):
self.assertEqual(return_value, 0, stderr)
- got, want, res = self.check_result(inspect.currentframe().f_code.co_name,
+ got, want, res, report =
self.check_result(inspect.currentframe().f_code.co_name,
depmap)
+ self.assertEqual(report, [])
self.assertEqual(res, True)
@mvn_depmap('a:b:12', 'usr/share/java/commons-io.jar', ['-n',
'myns'])
def test_namespace(self, stdout, stderr, return_value, depmap):
self.assertEqual(return_value, 0, stderr)
- got, want, res = self.check_result(inspect.currentframe().f_code.co_name,
+ got, want, res, report =
self.check_result(inspect.currentframe().f_code.co_name,
depmap)
+ self.assertEqual(report, [])
self.assertEqual(res, True)
@mvn_depmap('a:b:12', 'usr/share/java/commons-io.jar',
['--namespace=myns', '--append=x:y'])
def test_append_and_namespace(self, stdout, stderr, return_value, depmap):
self.assertEqual(return_value, 0, stderr)
- got, want, res = self.check_result(inspect.currentframe().f_code.co_name,
+ got, want, res, report =
self.check_result(inspect.currentframe().f_code.co_name,
depmap)
+ self.assertEqual(report, [])
self.assertEqual(res, True)
@mvn_depmap('a:b:12', 'usr/foo/share/java/foo.jar', ['-p',
'usr/foo'])
def test_prefix(self, stdout, stderr, return_value, depmap):
self.assertEqual(return_value, 0, stderr)
- got, want, res = self.check_result(inspect.currentframe().f_code.co_name,
+ got, want, res, report =
self.check_result(inspect.currentframe().f_code.co_name,
depmap)
+ self.assertEqual(report, [])
self.assertEqual(res, True)
@mvn_depmap('a:b:12', 'usr/foo/share/java/.out_archive.jar')