ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-01-01 18:56:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

special-case pypy

Browse Source
This commit is contained in:
meejah 2019-12-30 20:25:59 -07:00
parent 13350d60c2
commit 00373fc211
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/allmydata/test/test_backupdb.py
View File

@ -1,4 +1,4 @@
import sys
import os.path, time import os.path, time
from six.moves import cStringIO as StringIO from six.moves import cStringIO as StringIO
from twisted.trial import unittest from twisted.trial import unittest
@ -60,6 +60,10 @@ class BackupDB(unittest.TestCase):
bdb = backupdb.get_backupdb(where, stderr_f) bdb = backupdb.get_backupdb(where, stderr_f)
self.failUnlessEqual(bdb, None) self.failUnlessEqual(bdb, None)
stderr = stderr_f.getvalue() stderr = stderr_f.getvalue()
# the error-message is different under PyPy ... not sure why?
if 'pypy' in sys.version.lower():
self.failUnlessIn("Could not open database", stderr)
else:
self.failUnlessIn("unable to open database file", stderr) self.failUnlessIn("unable to open database file", stderr)

4
src/allmydata/test/test_system.py
View File

@ -421,10 +421,10 @@ def _render_section_values(values):
class SystemTestMixin(pollmixin.PollMixin, testutil.StallMixin): class SystemTestMixin(pollmixin.PollMixin, testutil.StallMixin):
def setUp(self):
if 'pypy' in sys.version.lower(): if 'pypy' in sys.version.lower():
self.skip = "pypy can't run these, due to SSL errors (ee key too tiny)" skip = "pypy can't run these, due to SSL errors (ee key too tiny)"
def setUp(self):
self.port_assigner = SameProcessStreamEndpointAssigner() self.port_assigner = SameProcessStreamEndpointAssigner()
self.port_assigner.setUp() self.port_assigner.setUp()
self.addCleanup(self.port_assigner.tearDown) self.addCleanup(self.port_assigner.tearDown)