Commit f5e82460 authored by Jérome Perrin's avatar Jérome Perrin

testInvalidationBug: skip for ZEO>=5

parent 1c57528b
...@@ -32,10 +32,15 @@ import threading ...@@ -32,10 +32,15 @@ import threading
import unittest import unittest
import urllib import urllib
import transaction import transaction
import pkg_resources
from DateTime import DateTime from DateTime import DateTime
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
from Products.ERP5Type.tests.utils import createZODBPythonScript from Products.ERP5Type.tests.utils import createZODBPythonScript
ZEO5 = pkg_resources.parse_version(
pkg_resources.get_distribution('ZEO').version
) >= pkg_resources.parse_version('5')
class TestInvalidationBug(ERP5TypeTestCase): class TestInvalidationBug(ERP5TypeTestCase):
def getTitle(self): def getTitle(self):
...@@ -94,9 +99,7 @@ class TestInvalidationBug(ERP5TypeTestCase): ...@@ -94,9 +99,7 @@ class TestInvalidationBug(ERP5TypeTestCase):
self.assertEqual(result_catalog_count, 1) self.assertEqual(result_catalog_count, 1)
self.assertGreaterEqual(result_activity_count, 1) self.assertGreaterEqual(result_activity_count, 1)
# TODO: - skip this test for ZEO>=5 because it's covered upstream @unittest.skipIf(ZEO5, "Covered upstream on ZEO>=5")
# (and later remove it)
# - in slapos.git, enable server_sync in zope.conf
def testLateInvalidationFromZEO(self): def testLateInvalidationFromZEO(self):
### Check unit test is run properly ### Check unit test is run properly
from ZEO.ClientStorage import ClientStorage from ZEO.ClientStorage import ClientStorage
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment