From: David-Sarah Hopwood <david-sarah@jacaranda.org>
Date: Wed, 24 Oct 2012 22:47:44 +0000 (+0100)
Subject: test_runner: we no longer need to skip tests on Twisted < 9.0.
X-Git-Tag: allmydata-tahoe-1.10a1~48
X-Git-Url: https://git.rkrishnan.org/listings/statistics?a=commitdiff_plain;h=b3bf20748f66164751367ec3dcbb32e29ffa23ed;p=tahoe-lafs%2Ftahoe-lafs.git

test_runner: we no longer need to skip tests on Twisted < 9.0.

Signed-off-by: David-Sarah Hopwood <david-sarah@jacaranda.org>
---

diff --git a/src/allmydata/test/test_runner.py b/src/allmydata/test/test_runner.py
index 4e9f683d..6aaed803 100644
--- a/src/allmydata/test/test_runner.py
+++ b/src/allmydata/test/test_runner.py
@@ -194,12 +194,6 @@ class BinTahoe(common_util.SignalMixin, unittest.TestCase, RunBinTahoeMixin):
     def test_version_no_noise(self):
         self.skip_if_cannot_run_bintahoe()
 
-        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"])
         def _cb(res):
             out, err, rc_or_sig = res
@@ -473,12 +467,6 @@ class RunNode(common_util.SignalMixin, unittest.TestCase, pollmixin.PollMixin,
     def test_client_no_noise(self):
         self.skip_if_cannot_daemonize()
 
-        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")