From: david-sarah <david-sarah@jacaranda.org>
Date: Sat, 22 Jan 2011 01:42:56 +0000 (-0800)
Subject: tests: use verlib to compare versions, and get the versions of Twisted and Nevow... 
X-Git-Tag: allmydata-tahoe-1.8.2b1~13
X-Git-Url: https://git.rkrishnan.org/%5B/%5D%20/readonly?a=commitdiff_plain;h=f84f2aa98777c10d0348f563c9a639ed2ed54a67;p=tahoe-lafs%2Ftahoe-lafs.git

tests: use verlib to compare versions, and get the versions of Twisted and Nevow from get_package_versions() instead of pkg_resources. refs #1287
---

diff --git a/src/allmydata/test/test_nevow.py b/src/allmydata/test/test_nevow.py
index 1b1656f8..39b1d80b 100644
--- a/src/allmydata/test/test_nevow.py
+++ b/src/allmydata/test/test_nevow.py
@@ -7,9 +7,11 @@ class Web(unittest.TestCase):
         """
         Sometimes Nevow can't find its resource files such as its default css file.
         """
-        import pkg_resources
-        try:
-            pkg_resources.require("Nevow>=0.9.33")
-        except pkg_resources.VersionConflict:
+
+        from allmydata import get_package_versions, normalized_version
+        nevow_ver = get_package_versions()['Nevow']
+
+        if not normalized_version(nevow_ver) >= normalized_version('0.9.33'):
             raise unittest.SkipTest("We pass this test only with Nevow >= v0.9.33, which is the first version of Nevow that has our patch from http://www.divmod.org/trac/ticket/2527")
+
         webform.defaultCSS.openForReading()
diff --git a/src/allmydata/test/test_runner.py b/src/allmydata/test/test_runner.py
index a7babdc2..7990c63a 100644
--- a/src/allmydata/test/test_runner.py
+++ b/src/allmydata/test/test_runner.py
@@ -133,38 +133,30 @@ class BinTahoe(common_util.SignalMixin, unittest.TestCase, RunBinTahoeMixin):
     def test_path(self):
         d = self.run_bintahoe(["--version-and-path"])
         def _cb(res):
+            from allmydata import normalized_version
+
             out, err, rc_or_sig = res
             self.failUnlessEqual(rc_or_sig, 0, str(res))
 
             # Fail unless the allmydata-tahoe package is *this* version *and*
             # was loaded from *this* source directory.
 
-            verstr = str(allmydata.__version__)
+            required_verstr = str(allmydata.__version__)
 
-            self.failIfEqual(verstr, "unknown",
+            self.failIfEqual(required_verstr, "unknown",
                              "We don't know our version, because this distribution didn't come "
                              "with a _version.py and 'setup.py darcsver' hasn't been run.")
 
-            # The Python "rational version numbering" convention
-            # disallows "-r$REV" but allows ".post$REV"
-            # instead. Eventually we'll probably move to that. When we
-            # do, this test won't go red:
-
-            ix = verstr.rfind('-r')
-            if ix != -1:
-                altverstr = verstr[:ix] + '.post' + verstr[ix+2:]
-            else:
-                ix = verstr.rfind('.post')
-                if ix != -1:
-                    altverstr = verstr[:ix] + '-r' + verstr[ix+5:]
-                else:
-                    altverstr = verstr
-
             srcdir = os.path.dirname(os.path.dirname(os.path.normcase(os.path.realpath(srcfile))))
-            required_ver_and_path = "%s: %s (%s)" % (allmydata.__appname__, verstr, srcdir)
-            alt_required_ver_and_path = "%s: %s (%s)" % (allmydata.__appname__, altverstr, srcdir)
+            info = (res, allmydata.__appname__, required_verstr, srcdir)
+
+            appverpath = out.split(')')[0]
+            (appver, path) = appverpath.split(' (')
+            (app, ver) = appver.split(': ')
 
-            self.failUnless(out.startswith(required_ver_and_path) or out.startswith(alt_required_ver_and_path), (out, err, rc_or_sig, required_ver_and_path))
+            self.failUnlessEqual(app, allmydata.__appname__, info)
+            self.failUnlessEqual(normalized_version(ver), normalized_version(required_verstr), info)
+            self.failUnlessEqual(path, srcdir, info)
         d.addCallback(_cb)
         return d
 
@@ -198,10 +190,11 @@ class BinTahoe(common_util.SignalMixin, unittest.TestCase, RunBinTahoeMixin):
 
     def test_version_no_noise(self):
         self.skip_if_cannot_run_bintahoe()
-        import pkg_resources
-        try:
-            pkg_resources.require("Twisted>=9.0.0")
-        except pkg_resources.VersionConflict:
+
+        from allmydata import get_package_versions, normalized_version
+        twisted_ver = get_package_versions()['Twisted']
+
+        if not normalized_version(twisted_ver) >= normalized_version('9.0.0'):
             raise unittest.SkipTest("We pass this test only with Twisted >= v9.0.0")
 
         d = self.run_bintahoe(["--version"])
@@ -449,11 +442,13 @@ class RunNode(common_util.SignalMixin, unittest.TestCase, pollmixin.PollMixin,
 
     def test_client_no_noise(self):
         self.skip_if_cannot_daemonize()
-        import pkg_resources
-        try:
-            pkg_resources.require("Twisted>=9.0.0")
-        except pkg_resources.VersionConflict:
+
+        from allmydata import get_package_versions, normalized_version
+        twisted_ver = get_package_versions()['Twisted']
+
+        if not normalized_version(twisted_ver) >= normalized_version('9.0.0'):
             raise unittest.SkipTest("We pass this test only with Twisted >= v9.0.0")
+
         basedir = self.workdir("test_client_no_noise")
         c1 = os.path.join(basedir, "c1")
         HOTLINE_FILE = os.path.join(c1, "suicide_prevention_hotline")