Changeset 00373fc in trunk

Timestamp:

2020-05-05T03:59:15Z (5 years ago)

Author:

meejah <meejah@…>

Branches:

master

Children:

1e039d8

Parents:

13350d6

git-author:

meejah <meejah@…> (2019-12-31 03:25:59)

git-committer:

meejah <meejah@…> (2020-05-05 03:59:15)

Message:

special-case pypy

Location:

src/allmydata/test

Files:

• test_backupdb.py (modified) (2 diffs)
• test_system.py (modified) (1 diff)

src/allmydata/test/test_backupdb.py ¶

@@ -1 @@
-
+import sys
 import os.path, time
 from six.moves import cStringIO as StringIO
@@ -61 +61 @@
         self.failUnlessEqual(bdb, None)
         stderr = stderr_f.getvalue()
-        self.failUnlessIn("unable to open database file", stderr)
+        # 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)
 
 

src/allmydata/test/test_system.py ¶

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