Merge pull request #30925 from ckauhaus/submit/30892-zodb-test

ZODB: fix broken tests in 5.3.0
This commit is contained in:
Frederik Rietdijk 2017-10-29 14:46:14 +01:00 committed by GitHub
commit 529c000c08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 0 deletions

View File

@ -0,0 +1,29 @@
Tests are kind of broken in ZODB-5.3.0. Fix setup code and disable one
especially problematic test.
diff -u ZODB-5.3.0/setup.py ZODB-5.3.0/setup.py
--- ZODB-5.3.0/setup.py 2017-08-30 14:55:10.000000000 +0200
+++ ZODB-5.3.0/setup.py 2017-10-29 11:34:17.277953730 +0100
@@ -85,7 +85,10 @@
mod = __import__(
_modname(dirpath, base, os.path.splitext(filename)[0]),
{}, {}, ['*'])
- _unittests_only(suite, mod.test_suite())
+ try:
+ _unittests_only(suite, mod.test_suite())
+ except AttributeError:
+ pass
elif 'tests.py' in filenames:
mod = __import__(_modname(dirpath, base, 'tests'), {}, {}, ['*'])
_unittests_only(suite, mod.test_suite())
diff -u ZODB-5.3.0/src/ZODB/scripts/tests/test_repozo.py ZODB-5.3.0/src/ZODB/scripts/tests/test_repozo.py
--- ZODB-5.3.0/src/ZODB/scripts/tests/test_repozo.py 2017-08-30 14:55:10.000000000 +0200
+++ ZODB-5.3.0/src/ZODB/scripts/tests/test_repozo.py 2017-10-29 11:35:10.348240386 +0100
@@ -1184,7 +1184,4 @@
#unittest.makeSuite(Test_do_backup), #TODO
unittest.makeSuite(Test_do_recover),
unittest.makeSuite(Test_do_verify),
- # N.B.: this test take forever to run (~40sec on a fast laptop),
- # *and* it is non-deterministic.
- unittest.makeSuite(MonteCarloTests),
])

View File

@ -25,6 +25,10 @@ buildPythonPackage rec {
sha256 = "633c2f89481d8ebc55639b59216f7d16d07b44a94758850c0b887006967214f3"; sha256 = "633c2f89481d8ebc55639b59216f7d16d07b44a94758850c0b887006967214f3";
}; };
patches = [
./ZODB-5.3.0-fix-tests.patch
];
propagatedBuildInputs = [ propagatedBuildInputs = [
manuel manuel
transaction transaction