X-Git-Url: https://git.rkrishnan.org/?a=blobdiff_plain;f=src%2Fallmydata%2Ftest%2Ftest_version.py;h=9433e36598538a40550b07ddd1be8a385a85a977;hb=323952792926f0e51414a51d48821f45ad9c2f86;hp=076e6189baf1c0a58d1628bedfad50699676c562;hpb=29ab496bd75c8f9c1891f7a97ff9e682c79277e4;p=tahoe-lafs%2Ftahoe-lafs.git

diff --git a/src/allmydata/test/test_version.py b/src/allmydata/test/test_version.py
index 076e6189..9433e365 100644
--- a/src/allmydata/test/test_version.py
+++ b/src/allmydata/test/test_version.py
@@ -73,71 +73,65 @@ class CheckRequirement(unittest.TestCase):
         # The bug in #1355 is triggered when a version string from either pkg_resources or import
         # is not parseable at all by normalized_version.
 
-        (errors, extras) = cross_check({"foo": ("unparseable", "")}, [("foo", ("1.0", "", None))])
-        self.failUnlessEqual(extras, [])
-        self.failUnlessEqual(len(errors), 1)
-        self.failUnlessIn("by pkg_resources could not be parsed", errors[0])
+        res = cross_check({"foo": ("unparseable", "")}, [("foo", ("1.0", "", None))])
+        self.failUnlessEqual(len(res), 1)
+        self.failUnlessIn("by pkg_resources could not be parsed", res[0])
 
-        (errors, extras) = cross_check({"foo": ("1.0", "")}, [("foo", ("unparseable", "", None))])
-        self.failUnlessEqual(extras, [])
-        self.failUnlessEqual(len(errors), 1)
-        self.failUnlessIn(") could not be parsed", errors[0])
+        res = cross_check({"foo": ("1.0", "")}, [("foo", ("unparseable", "", None))])
+        self.failUnlessEqual(len(res), 1)
+        self.failUnlessIn(") could not be parsed", res[0])
 
     def test_cross_check(self):
         res = cross_check({}, [])
-        self.failUnlessEqual(res, ([], []))
+        self.failUnlessEqual(res, [])
 
         res = cross_check({}, [("allmydata-tahoe", ("1.0", "", "blah"))])
-        self.failUnlessEqual(res, ([], []))
+        self.failUnlessEqual(res, [])
 
         res = cross_check({"foo": ("unparseable", "")}, [])
-        self.failUnlessEqual(res, ([], [("foo", ("unparseable", "", "according to pkg_resources"))]))
+        self.failUnlessEqual(len(res), 1)
+        self.failUnlessIn("not found by import", res[0])
 
         res = cross_check({"argparse": ("unparseable", "")}, [])
-        self.failUnlessEqual(res, ([], []))
+        self.failUnlessEqual(len(res), 0)
 
-        (errors, extras) = cross_check({}, [("foo", ("unparseable", "", None))])
-        self.failUnlessEqual(extras, [])
-        self.failUnlessEqual(len(errors), 1)
-        self.failUnlessIn("was not found by pkg_resources", errors[0])
+        res = cross_check({}, [("foo", ("unparseable", "", None))])
+        self.failUnlessEqual(len(res), 1)
+        self.failUnlessIn("not found by pkg_resources", res[0])
 
         res = cross_check({"distribute": ("1.0", "/somewhere")}, [("setuptools", ("2.0", "/somewhere", "distribute"))])
-        self.failUnlessEqual(res, ([], []))
+        self.failUnlessEqual(len(res), 0)
 
-        (errors, extras) = cross_check({"distribute": ("1.0", "/somewhere")}, [("setuptools", ("2.0", "/somewhere", None))])
-        self.failUnlessEqual(extras, [])
-        self.failUnlessEqual(len(errors), 1)
-        self.failUnlessIn("location mismatch", errors[0])
+        res = cross_check({"distribute": ("1.0", "/somewhere")}, [("setuptools", ("2.0", "/somewhere", None))])
+        self.failUnlessEqual(len(res), 1)
+        self.failUnlessIn("location mismatch", res[0])
 
-        (errors, extras) = cross_check({"distribute": ("1.0", "/somewhere")}, [("setuptools", ("2.0", "/somewhere_different", None))])
-        self.failUnlessEqual(extras, [])
-        self.failUnlessEqual(len(errors), 1)
-        self.failUnlessIn("location mismatch", errors[0])
+        res = cross_check({"distribute": ("1.0", "/somewhere")}, [("setuptools", ("2.0", "/somewhere_different", None))])
+        self.failUnlessEqual(len(res), 1)
+        self.failUnlessIn("location mismatch", res[0])
 
         res = cross_check({"zope.interface": ("1.0", "")}, [("zope.interface", ("unknown", "", None))])
-        self.failUnlessEqual(res, ([], []))
+        self.failUnlessEqual(len(res), 0)
 
-        (errors, extras) = cross_check({"foo": ("1.0", "")}, [("foo", ("unknown", "", None))])
-        self.failUnlessEqual(extras, [])
-        self.failUnlessEqual(len(errors), 1)
-        self.failUnlessIn("could not find a version number", errors[0])
+        res = cross_check({"foo": ("1.0", "")}, [("foo", ("unknown", "", None))])
+        self.failUnlessEqual(len(res), 1)
+        self.failUnlessIn("could not find a version number", res[0])
 
         # When pkg_resources and import both find a package, there is only a warning if both
         # the version and the path fail to match.
 
         res = cross_check({"foo": ("1.0", "/somewhere")}, [("foo", ("2.0", "/somewhere", None))])
-        self.failUnlessEqual(res, ([], []))
+        self.failUnlessEqual(len(res), 0)
 
         res = cross_check({"foo": ("1.0", "/somewhere")}, [("foo", ("1.0", "/somewhere_different", None))])
-        self.failUnlessEqual(res, ([], []))
+        self.failUnlessEqual(len(res), 0)
 
         res = cross_check({"foo": ("1.0-r123", "/somewhere")}, [("foo", ("1.0.post123", "/somewhere_different", None))])
-        self.failUnlessEqual(res, ([], []))
+        self.failUnlessEqual(len(res), 0)
 
-        (errors, extras) = cross_check({"foo": ("1.0", "/somewhere")}, [("foo", ("2.0", "/somewhere_different", None))])
-        self.failUnlessEqual(extras, [])
-        self.failUnlessEqual(len(errors), 1)
-        self.failUnlessIn("but version '2.0'", errors[0])
+        res = cross_check({"foo": ("1.0", "/somewhere")}, [("foo", ("2.0", "/somewhere_different", None))])
+        self.failUnlessEqual(len(res), 1)
+        self.failUnlessIn("but version '2.0'", res[0])
 
     def test_extract_openssl_version(self):
         self.failUnlessEqual(extract_openssl_version(MockSSL("")),