test_system: remove foolscap version check

Our install_requires= want foolscap>=0.10.1, and this check only fired
if we were given <0.6.4, so the check should be obsolete.

Also, the check was breaking my attempt to test Tahoe against a
development release of Foolscap, as the NormalizedVersion call threw an
IrrationalVersionError at my Versioneer-based "0.10.1+14.g37d8279"
version string.
This commit is contained in:
Brian Warner 2016-03-23 02:12:12 -07:00
parent 831b39d8fb
commit b5aad1ba4c

View File

@ -15,7 +15,6 @@ from allmydata.immutable.literal import LiteralFileNode
from allmydata.immutable.filenode import ImmutableFileNode from allmydata.immutable.filenode import ImmutableFileNode
from allmydata.util import idlib, mathutil from allmydata.util import idlib, mathutil
from allmydata.util import log, base32 from allmydata.util import log, base32
from allmydata.util.verlib import NormalizedVersion
from allmydata.util.encodingutil import quote_output, unicode_to_argv from allmydata.util.encodingutil import quote_output, unicode_to_argv
from allmydata.util.fileutil import abspath_expanduser_unicode from allmydata.util.fileutil import abspath_expanduser_unicode
from allmydata.util.consumer import MemoryConsumer, download_to_data from allmydata.util.consumer import MemoryConsumer, download_to_data
@ -27,7 +26,6 @@ from allmydata.mutable.common import NotWriteableError
from allmydata.mutable import layout as mutable_layout from allmydata.mutable import layout as mutable_layout
from allmydata.mutable.publish import MutableData from allmydata.mutable.publish import MutableData
import foolscap
from foolscap.api import DeadReferenceError, fireEventually from foolscap.api import DeadReferenceError, fireEventually
from twisted.python.failure import Failure from twisted.python.failure import Failure
from twisted.web.client import getPage from twisted.web.client import getPage
@ -1877,10 +1875,6 @@ class SystemTest(SystemTestMixin, RunBinTahoeMixin, unittest.TestCase):
class Connections(SystemTestMixin, unittest.TestCase): class Connections(SystemTestMixin, unittest.TestCase):
def test_rref(self): def test_rref(self):
if NormalizedVersion(foolscap.__version__) < NormalizedVersion('0.6.4'):
raise unittest.SkipTest("skipped due to http://foolscap.lothar.com/trac/ticket/196 "
"(which does not affect normal usage of Tahoe-LAFS)")
self.basedir = "system/Connections/rref" self.basedir = "system/Connections/rref"
d = self.set_up_nodes(2) d = self.set_up_nodes(2)
def _start(ign): def _start(ign):