Commit 387e4427 authored by Shane Hathaway's avatar Shane Hathaway

The range tests don't really require Data.fs.in if we just create an

Application instance on the fly.
parent 23543b7f
...@@ -86,6 +86,7 @@ import os, sys, unittest ...@@ -86,6 +86,7 @@ import os, sys, unittest
import string, whrandom, cStringIO, time, re import string, whrandom, cStringIO, time, re
import ZODB import ZODB
from OFS.Application import Application
from OFS.Folder import manage_addFolder from OFS.Folder import manage_addFolder
from OFS.Image import manage_addFile from OFS.Image import manage_addFile
from Testing.makerequest import makerequest from Testing.makerequest import makerequest
...@@ -96,13 +97,12 @@ from multifile import MultiFile ...@@ -96,13 +97,12 @@ from multifile import MultiFile
def makeConnection(): def makeConnection():
import ZODB import ZODB
from ZODB.FileStorage import FileStorage
from ZODB.DemoStorage import DemoStorage from ZODB.DemoStorage import DemoStorage
dfi = os.path.join( os.environ['SOFTWARE_HOME'] dfi = os.path.join( os.environ['SOFTWARE_HOME']
, '..', '..', 'var', 'Data.fs.in') , '..', '..', 'var', 'Data.fs.in')
dfi = os.path.abspath(dfi) dfi = os.path.abspath(dfi)
s = DemoStorage(base=FileStorage(dfi, read_only=1), quota=(1<<20)) s = DemoStorage(quota=(1<<20))
return ZODB.DB( s ).open() return ZODB.DB( s ).open()
def createBigFile(): def createBigFile():
...@@ -127,7 +127,10 @@ class TestRequestRange(unittest.TestCase): ...@@ -127,7 +127,10 @@ class TestRequestRange(unittest.TestCase):
self.responseOut = cStringIO.StringIO() self.responseOut = cStringIO.StringIO()
self.connection = makeConnection() self.connection = makeConnection()
try: try:
self.root = self.connection.root()[ 'Application' ] r = self.connection.root()
a = Application()
r['Application'] = a
self.root = a
self.app = makerequest(self.root, stdout=self.responseOut) self.app = makerequest(self.root, stdout=self.responseOut)
try: self.app._delObject(TESTFOLDER_NAME) try: self.app._delObject(TESTFOLDER_NAME)
except AttributeError: pass except AttributeError: pass
......
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