From: david-sarah <david-sarah@jacaranda.org>
Date: Fri, 28 Jan 2011 19:24:52 +0000 (-0800)
Subject: Change tests for check_requirement to ensure that it accepts None in the comment... 
X-Git-Tag: trac-5000~2
X-Git-Url: https://git.rkrishnan.org/vdrive/%22file:/frontends/index.php?a=commitdiff_plain;h=d318122cd25591cba1a4ba11957832b906439ca0;p=tahoe-lafs%2Ftahoe-lafs.git

Change tests for check_requirement to ensure that it accepts None in the comment field of a (version, location, comment) triple, and add a test that it raises ImportError when a module couldn't be imported. Also fix typo in a comment. refs #1339
---

diff --git a/src/allmydata/test/test_version.py b/src/allmydata/test/test_version.py
index 2c098c7e..6c009084 100644
--- a/src/allmydata/test/test_version.py
+++ b/src/allmydata/test/test_version.py
@@ -9,23 +9,27 @@ from allmydata.util.verlib import NormalizedVersion as V, \
 
 class CheckRequirement(unittest.TestCase):
     def test_check_requirement(self):
-        check_requirement("setuptools >= 0.6c6", {"setuptools": ("0.6", "", "")})
-        check_requirement("pycrypto == 2.0.1, == 2.1, >= 2.3", {"pycrypto": ("2.1.0", "", "")})
-        check_requirement("pycrypto == 2.0.1, == 2.1, >= 2.3", {"pycrypto": ("2.4.0", "", "")})
+        check_requirement("setuptools >= 0.6c6", {"setuptools": ("0.6", "", None)})
+        check_requirement("setuptools >= 0.6c6", {"setuptools": ("0.6", "", "distribute")})
+        check_requirement("pycrypto == 2.0.1, == 2.1, >= 2.3", {"pycrypto": ("2.1.0", "", None)})
+        check_requirement("pycrypto == 2.0.1, == 2.1, >= 2.3", {"pycrypto": ("2.4.0", "", None)})
 
-        check_requirement("zope.interface", {"zope.interface": ("unknown", "", "")})
-        check_requirement("mock", {"mock": ("0.6.0", "", "")})
-        check_requirement("foo >= 1.0", {"foo": ("1.0", "", ""), "bar": ("2.0", "", "")})
+        check_requirement("zope.interface", {"zope.interface": ("unknown", "", None)})
+        check_requirement("mock", {"mock": ("0.6.0", "", None)})
+        check_requirement("foo >= 1.0", {"foo": ("1.0", "", None), "bar": ("2.0", "", None)})
 
-        check_requirement("foolscap[secure_connections] >= 0.6.0", {"foolscap": ("0.7.0", "", "")})
+        check_requirement("foolscap[secure_connections] >= 0.6.0", {"foolscap": ("0.7.0", "", None)})
 
         self.failUnlessRaises(PackagingError, check_requirement,
-                              "foolscap[secure_connections] >= 0.6.0", {"foolscap": ("0.5.1", "", "")})
+                              "foolscap[secure_connections] >= 0.6.0", {"foolscap": ("0.5.1", "", None)})
         self.failUnlessRaises(PackagingError, check_requirement,
-                              "pycrypto == 2.0.1, == 2.1, >= 2.3", {"pycrypto": ("2.2.0", "", "")})
+                              "pycrypto == 2.0.1, == 2.1, >= 2.3", {"pycrypto": ("2.2.0", "", None)})
         self.failUnlessRaises(PackagingError, check_requirement,
                               "foo >= 1.0", {})
 
+        self.failUnlessRaises(ImportError, check_requirement,
+                              "foo >= 1.0", {"foo": (None, None, "foomodule")})
+
 
 # based on https://bitbucket.org/tarek/distutilsversion/src/17df9a7d96ef/test_verlib.py
 
@@ -121,7 +125,7 @@ class VersionTestCase(unittest.TestCase):
         self.failUnlessEqual(suggest('9.0.0pre1'), '9.0.0c1')
 
         # we want to be able to parse Tcl-TK
-        # they us "p1" "p2" for post releases
+        # they use "p1" "p2" for post releases
         self.failUnlessEqual(suggest('1.4p1'), '1.4.post1')
 
         # from darcsver