From: Daira Hopwood Date: Sat, 12 Apr 2014 16:57:32 +0000 (+0100) Subject: Fix tests for OpenSSL version check. X-Git-Url: https://git.rkrishnan.org/simplejson/$rel_link?a=commitdiff_plain;h=2939f88e6fba8211f8027caa7c3825003afece15;p=tahoe-lafs%2Ftahoe-lafs.git Fix tests for OpenSSL version check. Signed-off-by: Daira Hopwood --- diff --git a/src/allmydata/test/test_version.py b/src/allmydata/test/test_version.py index 9471016e..58a58518 100644 --- a/src/allmydata/test/test_version.py +++ b/src/allmydata/test/test_version.py @@ -147,6 +147,8 @@ class CheckRequirement(unittest.TestCase): self.failUnlessRaises(PackagingError, check_openssl_version, MockSSL("OpenSSL 1.0.0", True)) self.failUnlessRaises(PackagingError, check_openssl_version, MockSSL("OpenSSL 1.0.0k")) self.failUnlessRaises(PackagingError, check_openssl_version, MockSSL("OpenSSL 1.0.1")) + self.failUnlessRaises(PackagingError, check_openssl_version, MockSSL("OpenSSL 1.0.1", True)) + self.failUnlessRaises(PackagingError, check_openssl_version, MockSSL("OpenSSL 1.0.1c", True)) self.failUnlessRaises(PackagingError, check_openssl_version, MockSSL("OpenSSL 1.0.1e 11 Feb 2013")) self.failUnlessRaises(PackagingError, check_openssl_version, MockSSL("OpenSSL 1.0.1e 5 Apr 2014")) self.failUnlessRaises(PackagingError, check_openssl_version, MockSSL("OpenSSL 1.0.1e 7 Abc 2014")) @@ -161,9 +163,9 @@ class CheckRequirement(unittest.TestCase): check_openssl_version(MockSSL("OpenSSL 0.9.8z")) check_openssl_version(MockSSL("OpenSSL 1.0.0l")) check_openssl_version(MockSSL("OpenSSL 1.0.0m")) - check_openssl_version(MockSSL("OpenSSL 1.0.1", True)) + check_openssl_version(MockSSL("OpenSSL 1.0.1d", True)) check_openssl_version(MockSSL("OpenSSL 1.0.1e 11 Feb 2013", True)) - check_openssl_version(MockSSL("OpenSSL 1.0.1 7 Apr 2014")) + check_openssl_version(MockSSL("OpenSSL 1.0.1d 7 Apr 2014")) check_openssl_version(MockSSL("OpenSSL 1.0.1e 7 Apr 2014")) check_openssl_version(MockSSL("OpenSSL 1.0.1g 1 Mar 2014")) check_openssl_version(MockSSL("OpenSSL 1.0.1h 1 Jan 2015"))