Merge pull request #8 from plone/thet-zope4

Unskip test for Zope 4, as isolation problems are already fixed.

CHANGES.rst

@@ -16,6 +16,9 @@ Bug fixes:
 
 - Add coding header on python files.
  [gforcada]
+- Unskip test for Zope 4, as isolation problems are already fixed.
+  [thet]
+
 
 1.0.4 (2016-05-02)
 ------------------
@@ -31,6 +34,9 @@ New:
 
 Fixes:
 
+- Use a functional layer to resolve test isolation problems.
+  [gforcada]
+
 - Refactor doctest to an integration test and skip it for Zope 4 due to isolation problems.
   [pbauer]
 

plone/app/lockingbehavior/tests/test_locking.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 import unittest
-from pkg_resources import get_distribution
 from plone.app.lockingbehavior.testing import LOCKING_FUNCTIONAL_TESTING
 from plone.app.testing import SITE_OWNER_NAME
 from plone.app.testing import SITE_OWNER_PASSWORD
@@ -12,8 +11,6 @@
 from plone.testing import z2
 import transaction
 
-has_zope4 = get_distribution('Zope2').version.startswith('4')
-
 
 class TestLockingBehavior(unittest.TestCase):
 
@@ -47,7 +44,6 @@ def setUp(self):
         )
         self.bar_browser.open('http://nohost/plone')
 
-    @unittest.skipIf(has_zope4, 'Test-isolation issues with Zope4')
     def test_lockablebehavior(self):
         # Add a lockable item
         self.portal.invokeFactory(