commit 67313917ddf1735efeca91d055de2c98094479dc
Author: Michal Srb <msrb(a)redhat.com>
Date: Tue Jul 22 10:11:22 2014 +0200
[test] Migrate away from formencode
Latest formencode already supports python3, but the one in Fedora
doesn't. We have our own xml comparator, so we don't need this lib
anyway.
test/mvn_artifact_test.py | 58 ++++++++++++++++++++++----------------------
1 files changed, 29 insertions(+), 29 deletions(-)
---
diff --git a/test/mvn_artifact_test.py b/test/mvn_artifact_test.py
index e5e03db..7245550 100644
--- a/test/mvn_artifact_test.py
+++ b/test/mvn_artifact_test.py
@@ -2,10 +2,9 @@ import inspect
import os
import unittest
import shutil
-import javapackages.metadata as m
from test_common import *
from lxml import etree
-from formencode import doctest_xml_compare
+from xml_compare import compare_lxml_etree
class TestMvnArtifact(unittest.TestCase):
@@ -44,66 +43,67 @@ class TestMvnArtifact(unittest.TestCase):
print(report)
def check_result(self, test_name):
- dirpath = os.path.dirname(os.path.realpath(__file__))
got = etree.parse(".xmvn-reactor").getroot()
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 = compare_lxml_etree(got, want)
+ if report:
+ report = '\n' + report
+ return report
@mvn_artifact('args4j.pom')
def test_basic(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
- got, want, res = self.check_result(inspect.currentframe().f_code.co_name)
- self.assertEqual(res, True)
+ report = self.check_result(inspect.currentframe().f_code.co_name)
+ self.assertEqual(report, '', report)
@mvn_artifact('args4j.pom', 'maven-artifact.jar')
def test_basic_jar(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
- got, want, res = self.check_result(inspect.currentframe().f_code.co_name)
- self.assertEqual(res, True)
+ report = self.check_result(inspect.currentframe().f_code.co_name)
+ self.assertEqual(report, '', report)
@mvn_artifact('args4j.pom', 'webapp.war')
def test_artifact_war(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
- got, want, res = self.check_result(inspect.currentframe().f_code.co_name)
- self.assertEqual(res, True)
+ report = self.check_result(inspect.currentframe().f_code.co_name)
+ self.assertEqual(report, '', report)
@mvn_artifact('a:b:12', 'test.jar')
def test_mvn_spec_jar(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
- got, want, res = self.check_result(inspect.currentframe().f_code.co_name)
- self.assertEqual(res, True)
+ report = self.check_result(inspect.currentframe().f_code.co_name)
+ self.assertEqual(report, '', report)
@mvn_artifact('a:b:war:12', 'test.war')
def test_mvn_spec_war(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
- got, want, res = self.check_result(inspect.currentframe().f_code.co_name)
- self.assertEqual(res, True)
+ report = self.check_result(inspect.currentframe().f_code.co_name)
+ self.assertEqual(report, '', report)
@mvn_artifact('a:b:jar:12', 'test.jar')
def test_mvn_spec_ext(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
- got, want, res = self.check_result(inspect.currentframe().f_code.co_name)
- self.assertEqual(res, True)
+ report = self.check_result(inspect.currentframe().f_code.co_name)
+ self.assertEqual(report, '', report)
@mvn_artifact('a:b:war:12', 'test.war')
def test_mvn_spec_ext_war(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
- got, want, res = self.check_result(inspect.currentframe().f_code.co_name)
- self.assertEqual(res, True)
+ report = self.check_result(inspect.currentframe().f_code.co_name)
+ self.assertEqual(report, '', report)
@mvn_artifact('a:b::sources:12', 'test-sources.jar')
def test_mvn_spec_classifier(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
- got, want, res = self.check_result(inspect.currentframe().f_code.co_name)
- self.assertEqual(res, True)
+ report = self.check_result(inspect.currentframe().f_code.co_name)
+ self.assertEqual(report, '', report)
@mvn_artifact('a:b:war:javadoc:12', 'test-javadoc.war')
def test_mvn_spec_classifier_war(self, stdout, stderr, return_value):
self.assertEqual(return_value, 0, stderr)
- got, want, res = self.check_result(inspect.currentframe().f_code.co_name)
- self.assertEqual(res, True)
+ report = self.check_result(inspect.currentframe().f_code.co_name)
+ self.assertEqual(report, '', report)
@mvn_artifact('a:b:12')
def test_mvn_spec_nojar(self, stdout, stderr, return_value):
@@ -126,20 +126,20 @@ class TestMvnArtifact(unittest.TestCase):
#@mvn_artifact('args4j-deps.pom')
#def test_dependencies_1(self, stdout, stderr, return_value):
# self.assertEqual(return_value, 0, stderr)
- # got, want, res = self.check_result(inspect.currentframe().f_code.co_name)
- # self.assertEqual(res, True)
+ # report = self.check_result(inspect.currentframe().f_code.co_name)
+ # self.assertEqual(report, '', report)
#@mvn_artifact('args4j-deps.pom', 'some.jar')
#def test_dependencies_2(self, stdout, stderr, return_value):
# self.assertEqual(return_value, 0, stderr)
- # got, want, res = self.check_result(inspect.currentframe().f_code.co_name)
- # self.assertEqual(res, True)
+ # report = self.check_result(inspect.currentframe().f_code.co_name)
+ # self.assertEqual(report, '', report)
#@mvn_artifact('args4j-exclusions.pom', 'some.jar')
#def test_dependencies_exclusions(self, stdout, stderr, return_value):
# self.assertEqual(return_value, 0, stderr)
- # got, want, res = self.check_result(inspect.currentframe().f_code.co_name)
- # self.assertEqual(res, True)
+ # report = self.check_result(inspect.currentframe().f_code.co_name)
+ # self.assertEqual(report, '', report)
#@mvn_artifact('asm-analysis-5.0.2.pom')
#def test_missing_version(self, stdout, stderr, return_value):