stack demostorage only for one test, where it is needed.

plone/namedfile/testing.py

@@ -2,7 +2,7 @@
 from plone.testing import Layer
 from plone.testing import publisher
 from plone.testing import zca
-from plone.testing import zodb
+
 from plone.testing import zope
 from zope.configuration import xmlconfig
 
@@ -17,18 +17,7 @@ def setUp(self):
         import plone.namedfile
         xmlconfig.file('testing.zcml', plone.namedfile)
 
-        self['zodbDB_before_namedfile'] = self.get('zodbDB')
-        self['zodbDB'] = zodb.stackDemoStorage(
-            self.get('zodbDB'),
-            name='NamedFileFixture'
-        )
-
     def tearDown(self):
-        # Zap the stacked ZODB
-        self['zodbDB'].close()
-        self['zodbDB'] = self['zodbDB_before_namedfile']
-        del self['zodbDB_before_namedfile']
-
         # Zap the stacked zca context
         zca.popGlobalRegistry()
 

plone/namedfile/tests/test_scaling_functional.py

@@ -9,6 +9,7 @@
 from plone.namedfile.scaling import ImageScaling
 from plone.namedfile.testing import PLONE_NAMEDFILE_FUNCTIONAL_TESTING
 from plone.namedfile.tests import getFile
+from plone.testing import zodb
 from plone.testing.zope import Browser
 from six import BytesIO
 from zope.annotation import IAttributeAnnotatable
@@ -52,6 +53,11 @@ class ImagePublisherTests(unittest.TestCase):
     layer = PLONE_NAMEDFILE_FUNCTIONAL_TESTING
 
     def setUp(self):
+        self.layer['zodbDB_before_namedfile'] = self.layer.get('zodbDB')
+        self.layer['zodbDB'] = zodb.stackDemoStorage(
+            self.layer.get('zodbDB'),
+            name='NamedFileFixture'
+        )
         data = getFile('image.png')
         item = DummyContent()
         item.image = NamedImage(data, 'image/png', u'image.png')
@@ -67,6 +73,11 @@ def setUp(self):
     def tearDown(self):
         ImageScaling._sizes = self._orig_sizes
 
+        # Zap the stacked ZODB
+        # self['zodbDB'].close()
+        self.layer['zodbDB'] = self.layer['zodbDB_before_namedfile']
+        del self.layer['zodbDB_before_namedfile']
+
     def testPublishScaleViaUID(self):
         scale = self.view.scale('image', width=64, height=64)
         transaction.commit()