Skip to content

Z
ZODB
Commit 3fd87e79 authored by Jim Fulton's avatar Jim Fulton
Browse files
Options

Updated most tests to use a commob test framework to try to make sure 

tests have a clean transaction state and to avoid leaving files behind.
parent 59188e56
Show whitespace changes
Inline Side-by-side
Showing with 235 additions and 383 deletions
src/ZEO/scripts/manual_tests/testzeopack.py
View file @ 3fd87e79
...@@ -8,7 +8,6 @@ import ZODB ...@@ -8,7 +8,6 @@ import ZODB
import os import os
import socket import socket
import tempfile
import threading import threading
import time import time
import unittest import unittest
...@@ -22,11 +21,12 @@ import unittest ...@@ -22,11 +21,12 @@ import unittest
class PackerTests(StorageTestBase): class PackerTests(StorageTestBase):
def setUp(self): def setUp(self):
StorageTestBase.setUp(self)
self.started = 0 self.started = 0
def start(self): def start(self):
self.started =1 self.started =1
self.path = tempfile.mktemp(suffix=".fs") self.path = 'Data.fs'
self._storage = FileStorage(self.path) self._storage = FileStorage(self.path)
self.db = ZODB.DB(self._storage) self.db = ZODB.DB(self._storage)
self.do_updates() self.do_updates()
...@@ -37,10 +37,8 @@ class PackerTests(StorageTestBase): ...@@ -37,10 +37,8 @@ class PackerTests(StorageTestBase):
self._dostore() self._dostore()
def tearDown(self): def tearDown(self):
if not self.started: if self.started:
return
self.db.close() self.db.close()
self._storage.close()
self.exit.close() self.exit.close()
try: try:
os.kill(self.pid, 9) os.kill(self.pid, 9)
...@@ -51,12 +49,8 @@ class PackerTests(StorageTestBase): ...@@ -51,12 +49,8 @@ class PackerTests(StorageTestBase):
except os.error, err: except os.error, err:
##print "waitpid failed", err ##print "waitpid failed", err
pass pass
for ext in '', '.old', '.lock', '.index', '.tmp':
path = self.path + ext StorageTestBase.tearDown(self)
try:
os.remove(path)
except os.error:
pass
def set_inet_addr(self): def set_inet_addr(self):
self.host = socket.gethostname() self.host = socket.gethostname()
...@@ -80,7 +74,7 @@ class PackerTests(StorageTestBase): ...@@ -80,7 +74,7 @@ class PackerTests(StorageTestBase):
assert not os.path.exists(self.path + ".old") assert not os.path.exists(self.path + ".old")
def testAF_UNIXPack(self): def testAF_UNIXPack(self):
self.addr = tempfile.mktemp(suffix=".zeo-socket") self.addr = "zeo-socket"
self.start() self.start()
status = os.system("zeopack.py -U %s" % self.addr) status = os.system("zeopack.py -U %s" % self.addr)
assert status == 0 assert status == 0
......
src/ZEO/tests/ConnectionTests.py
View file @ 3fd87e79
...@@ -17,7 +17,6 @@ import sys ...@@ -17,7 +17,6 @@ import sys
import time import time
import random import random
import asyncore import asyncore
import tempfile
import threading import threading
import logging import logging
...@@ -33,6 +32,7 @@ from ZODB.tests.StorageTestBase import StorageTestBase ...@@ -33,6 +32,7 @@ from ZODB.tests.StorageTestBase import StorageTestBase
from ZODB.tests.MinPO import MinPO from ZODB.tests.MinPO import MinPO
from ZODB.tests.StorageTestBase \ from ZODB.tests.StorageTestBase \
import zodb_pickle, zodb_unpickle, handle_all_serials, handle_serials import zodb_pickle, zodb_unpickle, handle_all_serials, handle_serials
import ZODB.tests.util
import transaction import transaction
from transaction import Transaction from transaction import Transaction
...@@ -93,7 +93,7 @@ class CommonSetupTearDown(StorageTestBase): ...@@ -93,7 +93,7 @@ class CommonSetupTearDown(StorageTestBase):
monitor = 0 monitor = 0
db_class = DummyDB db_class = DummyDB
def setUp(self): def setUp(self, before=None):
"""Test setup for connection tests. """Test setup for connection tests.
This starts only one server; a test may start more servers by This starts only one server; a test may start more servers by
...@@ -102,8 +102,7 @@ class CommonSetupTearDown(StorageTestBase): ...@@ -102,8 +102,7 @@ class CommonSetupTearDown(StorageTestBase):
""" """
self.__super_setUp() self.__super_setUp()
logging.info("setUp() %s", self.id()) logging.info("setUp() %s", self.id())
fd, self.file = tempfile.mkstemp() self.file = 'storage_conf'
os.close(fd)
self.addr = [] self.addr = []
self._pids = [] self._pids = []
self._servers = [] self._servers = []
...@@ -141,8 +140,7 @@ class CommonSetupTearDown(StorageTestBase): ...@@ -141,8 +140,7 @@ class CommonSetupTearDown(StorageTestBase):
for c in self.caches: for c in self.caches:
for i in 0, 1: for i in 0, 1:
for ext in "", ".trace", ".lock": for ext in "", ".trace", ".lock":
base = "%s-%s.zec%s" % (c, "1", ext) path = "%s-%s.zec%s" % (c, "1", ext)
path = os.path.join(tempfile.tempdir, base)
# On Windows before 2.3, we don't have a way to wait for # On Windows before 2.3, we don't have a way to wait for
# the spawned server(s) to close, and they inherited # the spawned server(s) to close, and they inherited
# file descriptors for our open files. So long as those # file descriptors for our open files. So long as those
...@@ -183,7 +181,7 @@ class CommonSetupTearDown(StorageTestBase): ...@@ -183,7 +181,7 @@ class CommonSetupTearDown(StorageTestBase):
self.caches.append(cache) self.caches.append(cache)
storage = TestClientStorage(self.addr, storage = TestClientStorage(self.addr,
client=cache, client=cache,
var=tempfile.tempdir, var='.',
cache_size=cache_size, cache_size=cache_size,
wait=wait, wait=wait,
min_disconnect_poll=0.1, min_disconnect_poll=0.1,
......
src/ZEO/tests/testAuth.py
View file @ 3fd87e79
...@@ -30,7 +30,9 @@ class AuthTest(CommonSetupTearDown): ...@@ -30,7 +30,9 @@ class AuthTest(CommonSetupTearDown):
realm = None realm = None
def setUp(self): def setUp(self):
self.pwfile = tempfile.mktemp() fd, self.pwfile = tempfile.mkstemp('pwfile')
os.close(fd)
if self.realm: if self.realm:
self.pwdb = self.dbclass(self.pwfile, self.realm) self.pwdb = self.dbclass(self.pwfile, self.realm)
else: else:
...@@ -38,6 +40,7 @@ class AuthTest(CommonSetupTearDown): ...@@ -38,6 +40,7 @@ class AuthTest(CommonSetupTearDown):
self.pwdb.add_user("foo", "bar") self.pwdb.add_user("foo", "bar")
self.pwdb.save() self.pwdb.save()
self._checkZEOpasswd() self._checkZEOpasswd()
self.__super_setUp() self.__super_setUp()
def _checkZEOpasswd(self): def _checkZEOpasswd(self):
...@@ -51,8 +54,8 @@ class AuthTest(CommonSetupTearDown): ...@@ -51,8 +54,8 @@ class AuthTest(CommonSetupTearDown):
zeopasswd.main(args + ["foo", "bar"]) zeopasswd.main(args + ["foo", "bar"])
def tearDown(self): def tearDown(self):
self.__super_tearDown()
os.remove(self.pwfile) os.remove(self.pwfile)
self.__super_tearDown()
def getConfig(self, path, create, read_only): def getConfig(self, path, create, read_only):
return "<mappingstorage 1/>" return "<mappingstorage 1/>"
......
src/ZEO/tests/testZEO.py
View file @ 3fd87e79
...@@ -222,6 +222,7 @@ class GenericTests( ...@@ -222,6 +222,7 @@ class GenericTests(
blob_cache_dir = None blob_cache_dir = None
def setUp(self): def setUp(self):
StorageTestBase.StorageTestBase.setUp(self)
logger.info("setUp() %s", self.id()) logger.info("setUp() %s", self.id())
port = get_port() port = get_port()
zconf = forker.ZEOConfig(('', port)) zconf = forker.ZEOConfig(('', port))
...@@ -232,7 +233,9 @@ class GenericTests( ...@@ -232,7 +233,9 @@ class GenericTests(
self._conf_path = path self._conf_path = path
if not self.blob_cache_dir: if not self.blob_cache_dir:
# This is the blob cache for ClientStorage # This is the blob cache for ClientStorage
self.blob_cache_dir = tempfile.mkdtemp() self.blob_cache_dir = tempfile.mkdtemp(
'blob_cache',
dir=os.path.abspath(os.getcwd()))
self._storage = ClientStorage( self._storage = ClientStorage(
zport, '1', cache_size=20000000, zport, '1', cache_size=20000000,
min_disconnect_poll=0.5, wait=1, min_disconnect_poll=0.5, wait=1,
...@@ -242,14 +245,13 @@ class GenericTests( ...@@ -242,14 +245,13 @@ class GenericTests(
def tearDown(self): def tearDown(self):
self._storage.close() self._storage.close()
os.remove(self._conf_path)
ZODB.blob.remove_committed_dir(self.blob_cache_dir)
for server in self._servers: for server in self._servers:
forker.shutdown_zeo_server(server) forker.shutdown_zeo_server(server)
if hasattr(os, 'waitpid'): if hasattr(os, 'waitpid'):
# Not in Windows Python until 2.3 # Not in Windows Python until 2.3
for pid in self._pids: for pid in self._pids:
os.waitpid(pid, 0) os.waitpid(pid, 0)
StorageTestBase.StorageTestBase.tearDown(self)
def runTest(self): def runTest(self):
try: try:
...@@ -300,29 +302,22 @@ class FileStorageRecoveryTests(StorageTestBase.StorageTestBase, ...@@ -300,29 +302,22 @@ class FileStorageRecoveryTests(StorageTestBase.StorageTestBase,
level = 2 level = 2
def setUp(self):
self._storage = ZODB.FileStorage.FileStorage("Source.fs", create=True)
self._dst = ZODB.FileStorage.FileStorage("Dest.fs", create=True)
def getConfig(self): def getConfig(self):
filename = self.__fs_base = tempfile.mktemp()
return """\ return """\
<filestorage 1> <filestorage 1>
path %s path %s
</filestorage> </filestorage>
""" % filename """ % tempfile.mktemp(dir='.')
def _new_storage(self): def _new_storage(self):
port = get_port() port = get_port()
zconf = forker.ZEOConfig(('', port)) zconf = forker.ZEOConfig(('', port))
zport, adminaddr, pid, path = forker.start_zeo_server(self.getConfig(), zport, adminaddr, pid, path = forker.start_zeo_server(self.getConfig(),
zconf, port) zconf, port)
blob_cache_dir = tempfile.mkdtemp()
self._pids.append(pid) self._pids.append(pid)
self._servers.append(adminaddr) self._servers.append(adminaddr)
self._conf_paths.append(path)
self.blob_cache_dirs.append(blob_cache_dir) blob_cache_dir = tempfile.mkdtemp(dir='.')
storage = ClientStorage( storage = ClientStorage(
zport, '1', cache_size=20000000, zport, '1', cache_size=20000000,
...@@ -332,10 +327,9 @@ class FileStorageRecoveryTests(StorageTestBase.StorageTestBase, ...@@ -332,10 +327,9 @@ class FileStorageRecoveryTests(StorageTestBase.StorageTestBase,
return storage return storage
def setUp(self): def setUp(self):
StorageTestBase.StorageTestBase.setUp(self)
self._pids = [] self._pids = []
self._servers = [] self._servers = []
self._conf_paths = []
self.blob_cache_dirs = []
self._storage = self._new_storage() self._storage = self._new_storage()
self._dst = self._new_storage() self._dst = self._new_storage()
...@@ -344,16 +338,13 @@ class FileStorageRecoveryTests(StorageTestBase.StorageTestBase, ...@@ -344,16 +338,13 @@ class FileStorageRecoveryTests(StorageTestBase.StorageTestBase,
self._storage.close() self._storage.close()
self._dst.close() self._dst.close()
for p in self._conf_paths:
os.remove(p)
for p in self.blob_cache_dirs:
ZODB.blob.remove_committed_dir(p)
for server in self._servers: for server in self._servers:
forker.shutdown_zeo_server(server) forker.shutdown_zeo_server(server)
if hasattr(os, 'waitpid'): if hasattr(os, 'waitpid'):
# Not in Windows Python until 2.3 # Not in Windows Python until 2.3
for pid in self._pids: for pid in self._pids:
os.waitpid(pid, 0) os.waitpid(pid, 0)
StorageTestBase.StorageTestBase.tearDown(self)
def new_dest(self): def new_dest(self):
return self._new_storage() return self._new_storage()
...@@ -364,12 +355,11 @@ class FileStorageTests(FullGenericTests): ...@@ -364,12 +355,11 @@ class FileStorageTests(FullGenericTests):
level = 2 level = 2
def getConfig(self): def getConfig(self):
filename = self.__fs_base = tempfile.mktemp()
return """\ return """\
<filestorage 1> <filestorage 1>
path %s path Data.fs
</filestorage> </filestorage>
""" % filename """
def checkInterfaceFromRemoteStorage(self): def checkInterfaceFromRemoteStorage(self):
# ClientStorage itself doesn't implement IStorageIteration, but the # ClientStorage itself doesn't implement IStorageIteration, but the
...@@ -416,10 +406,10 @@ class DemoStorageTests( ...@@ -416,10 +406,10 @@ class DemoStorageTests(
return """ return """
<demostorage 1> <demostorage 1>
<filestorage 1> <filestorage 1>
path %s path Data.fs
</filestorage> </filestorage>
</demostorage> </demostorage>
""" % tempfile.mktemp() """
def checkUndoZombie(self): def checkUndoZombie(self):
# The test base class IteratorStorage assumes that we keep undo data # The test base class IteratorStorage assumes that we keep undo data
...@@ -615,22 +605,18 @@ test_classes = [OneTimeTests, ...@@ -615,22 +605,18 @@ test_classes = [OneTimeTests,
class CommonBlobTests: class CommonBlobTests:
def tearDown(self):
super(BlobAdaptedFileStorageTests, self).tearDown()
if os.path.exists(self.blobdir):
# Might be gone already if the super() method deleted
# the shared directory. Don't worry.
shutil.rmtree(self.blobdir)
def getConfig(self): def getConfig(self):
return """ return """
<blobstorage 1> <blobstorage 1>
blob-dir %s blob-dir blobs
<filestorage 2> <filestorage 2>
path %s path Data.fs
</filestorage> </filestorage>
</blobstorage> </blobstorage>
""" % (self.blobdir, self.filestorage) """
blobdir = 'blobs'
blob_cache_dir = 'blob_cache'
def checkStoreBlob(self): def checkStoreBlob(self):
from ZODB.utils import oid_repr, tid_repr from ZODB.utils import oid_repr, tid_repr
...@@ -713,24 +699,17 @@ class CommonBlobTests: ...@@ -713,24 +699,17 @@ class CommonBlobTests:
def checkTransactionBufferCleanup(self): def checkTransactionBufferCleanup(self):
oid = self._storage.new_oid() oid = self._storage.new_oid()
handle, blob_file_name = tempfile.mkstemp() open('blob_file', 'w').write('I am a happy blob.')
os.close(handle)
open(blob_file_name, 'w').write('I am a happy blob.')
t = transaction.Transaction() t = transaction.Transaction()
self._storage.tpc_begin(t) self._storage.tpc_begin(t)
self._storage.storeBlob( self._storage.storeBlob(
oid, ZODB.utils.z64, 'foo', blob_file_name, '', t) oid, ZODB.utils.z64, 'foo', 'blob_file', '', t)
self._storage.close() self._storage.close()
class BlobAdaptedFileStorageTests(FullGenericTests, CommonBlobTests): class BlobAdaptedFileStorageTests(FullGenericTests, CommonBlobTests):
"""ZEO backed by a BlobStorage-adapted FileStorage.""" """ZEO backed by a BlobStorage-adapted FileStorage."""
def setUp(self):
self.blobdir = tempfile.mkdtemp() # blob directory on ZEO server
self.filestorage = tempfile.mktemp()
super(BlobAdaptedFileStorageTests, self).setUp()
def checkStoreAndLoadBlob(self): def checkStoreAndLoadBlob(self):
from ZODB.utils import oid_repr, tid_repr from ZODB.utils import oid_repr, tid_repr
from ZODB.blob import Blob, BLOB_SUFFIX from ZODB.blob import Blob, BLOB_SUFFIX
...@@ -814,12 +793,8 @@ class BlobAdaptedFileStorageTests(FullGenericTests, CommonBlobTests): ...@@ -814,12 +793,8 @@ class BlobAdaptedFileStorageTests(FullGenericTests, CommonBlobTests):
class BlobWritableCacheTests(FullGenericTests, CommonBlobTests): class BlobWritableCacheTests(FullGenericTests, CommonBlobTests):
def setUp(self): blob_cache_dir = 'blobs'
self.blobdir = self.blob_cache_dir = tempfile.mkdtemp() shared_blob_dir = True
self.filestorage = tempfile.mktemp()
self.shared_blob_dir = True
super(BlobWritableCacheTests, self).setUp()
class StorageServerClientWrapper: class StorageServerClientWrapper:
......
src/ZEO/tests/test_cache.py
View file @ 3fd87e79
...@@ -43,7 +43,8 @@ def hexprint(file): ...@@ -43,7 +43,8 @@ def hexprint(file):
printable = "" printable = ""
hex = "" hex = ""
for character in line: for character in line:
if character in string.printable and not ord(character) in [12,13,9]: if (character in string.printable
and not ord(character) in [12,13,9]):
printable += character printable += character
else: else:
printable += '.' printable += '.'
......
src/ZODB/scripts/manual_tests/testfstest.py
View file @ 3fd87e79
...@@ -9,11 +9,12 @@ import re ...@@ -9,11 +9,12 @@ import re
import struct import struct
import tempfile import tempfile
import unittest import unittest
import ZODB.tests.util
import fstest import fstest
from fstest import FormatError, U64 from fstest import FormatError, U64
class TestCorruptedFS(unittest.TestCase): class TestCorruptedFS(ZODB.tests.util.TestCase):
f = open('test-checker.fs', 'rb') f = open('test-checker.fs', 'rb')
datafs = f.read() datafs = f.read()
...@@ -21,17 +22,14 @@ class TestCorruptedFS(unittest.TestCase): ...@@ -21,17 +22,14 @@ class TestCorruptedFS(unittest.TestCase):
del f del f
def setUp(self): def setUp(self):
self._temp = tempfile.mktemp() ZODB.tests.util.TestCase.setUp(self)
self._temp = 'Data.fs'
self._file = open(self._temp, 'wb') self._file = open(self._temp, 'wb')
def tearDown(self): def tearDown(self):
if not self._file.closed: if not self._file.closed:
self._file.close() self._file.close()
if os.path.exists(self._temp): ZODB.tests.util.TestCase.tearDown(self)
try:
os.remove(self._temp)
except os.error:
pass
def noError(self): def noError(self):
if not self._file.closed: if not self._file.closed:
......
src/ZODB/scripts/manual_tests/testzeopack.py
View file @ 3fd87e79
...@@ -22,11 +22,12 @@ import unittest ...@@ -22,11 +22,12 @@ import unittest
class PackerTests(StorageTestBase): class PackerTests(StorageTestBase):
def setUp(self): def setUp(self):
StorageTestBase.setUp(self)
self.started = 0 self.started = 0
def start(self): def start(self):
self.started =1 self.started =1
self.path = tempfile.mktemp(suffix=".fs") self.path = 'Data.fs'
self._storage = FileStorage(self.path) self._storage = FileStorage(self.path)
self.db = ZODB.DB(self._storage) self.db = ZODB.DB(self._storage)
self.do_updates() self.do_updates()
...@@ -37,10 +38,8 @@ class PackerTests(StorageTestBase): ...@@ -37,10 +38,8 @@ class PackerTests(StorageTestBase):
self._dostore() self._dostore()
def tearDown(self): def tearDown(self):
if not self.started: if self.started:
return
self.db.close() self.db.close()
self._storage.close()
self.exit.close() self.exit.close()
try: try:
os.kill(self.pid, 9) os.kill(self.pid, 9)
...@@ -51,12 +50,7 @@ class PackerTests(StorageTestBase): ...@@ -51,12 +50,7 @@ class PackerTests(StorageTestBase):
except os.error, err: except os.error, err:
##print "waitpid failed", err ##print "waitpid failed", err
pass pass
for ext in '', '.old', '.lock', '.index', '.tmp': StorageTestBase.tearDown(self)
path = self.path + ext
try:
os.remove(path)
except os.error:
pass
def set_inet_addr(self): def set_inet_addr(self):
self.host = socket.gethostname() self.host = socket.gethostname()
......
src/ZODB/tests/Corruption.py
View file @ 3fd87e79
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
import os import os
import random import random
import stat import stat
import tempfile
import ZODB, ZODB.FileStorage import ZODB, ZODB.FileStorage
from StorageTestBase import StorageTestBase from StorageTestBase import StorageTestBase
...@@ -24,12 +23,8 @@ from StorageTestBase import StorageTestBase ...@@ -24,12 +23,8 @@ from StorageTestBase import StorageTestBase
class FileStorageCorruptTests(StorageTestBase): class FileStorageCorruptTests(StorageTestBase):
def setUp(self): def setUp(self):
self.path = tempfile.mktemp() StorageTestBase.setUp(self)
self._storage = ZODB.FileStorage.FileStorage(self.path, create=1) self._storage = ZODB.FileStorage.FileStorage('Data.fs', create=1)
def tearDown(self):
self._storage.close()
self._storage.cleanup()
def _do_stores(self): def _do_stores(self):
oids = [] oids = []
...@@ -49,16 +44,15 @@ class FileStorageCorruptTests(StorageTestBase): ...@@ -49,16 +44,15 @@ class FileStorageCorruptTests(StorageTestBase):
self._close() self._close()
# truncation the index file # truncation the index file
path = self.path + '.index' self.failUnless(os.path.exists('Data.fs.index'))
self.failUnless(os.path.exists(path)) f = open('Data.fs.index', 'r+')
f = open(path, 'r+')
f.seek(0, 2) f.seek(0, 2)
size = f.tell() size = f.tell()
f.seek(size / 2) f.seek(size / 2)
f.truncate() f.truncate()
f.close() f.close()
self._storage = ZODB.FileStorage.FileStorage(self.path) self._storage = ZODB.FileStorage.FileStorage('Data.fs')
self._check_stores(oids) self._check_stores(oids)
def checkCorruptedIndex(self): def checkCorruptedIndex(self):
...@@ -66,14 +60,13 @@ class FileStorageCorruptTests(StorageTestBase): ...@@ -66,14 +60,13 @@ class FileStorageCorruptTests(StorageTestBase):
self._close() self._close()
# truncation the index file # truncation the index file
path = self.path + '.index' self.failUnless(os.path.exists('Data.fs.index'))
self.failUnless(os.path.exists(path)) size = os.stat('Data.fs.index')[stat.ST_SIZE]
size = os.stat(path)[stat.ST_SIZE] f = open('Data.fs.index', 'r+')
f = open(path, 'r+')
while f.tell() < size: while f.tell() < size:
f.seek(random.randrange(1, size / 10), 1) f.seek(random.randrange(1, size / 10), 1)
f.write('\000') f.write('\000')
f.close() f.close()
self._storage = ZODB.FileStorage.FileStorage(self.path) self._storage = ZODB.FileStorage.FileStorage('Data.fs')
self._check_stores(oids) self._check_stores(oids)
src/ZODB/tests/RecoveryStorage.py
View file @ 3fd87e79
...@@ -24,6 +24,7 @@ import time ...@@ -24,6 +24,7 @@ import time
class RecoveryStorage(IteratorDeepCompare): class RecoveryStorage(IteratorDeepCompare):
# Requires a setUp() that creates a self._dst destination storage # Requires a setUp() that creates a self._dst destination storage
def checkSimpleRecovery(self): def checkSimpleRecovery(self):
oid = self._storage.new_oid() oid = self._storage.new_oid()
......
src/ZODB/tests/StorageTestBase.py
View file @ 3fd87e79
...@@ -21,8 +21,6 @@ single object revision. ...@@ -21,8 +21,6 @@ single object revision.
import sys import sys
import time import time
import types
import unittest
from cPickle import Pickler, Unpickler from cPickle import Pickler, Unpickler
from cStringIO import StringIO from cStringIO import StringIO
...@@ -30,6 +28,7 @@ import transaction ...@@ -30,6 +28,7 @@ import transaction
from ZODB.utils import u64 from ZODB.utils import u64
from ZODB.tests.MinPO import MinPO from ZODB.tests.MinPO import MinPO
import ZODB.tests.util
ZERO = '\0'*8 ZERO = '\0'*8
...@@ -78,7 +77,7 @@ def zodb_unpickle(data): ...@@ -78,7 +77,7 @@ def zodb_unpickle(data):
u = Unpickler(f) u = Unpickler(f)
u.persistent_load = persistent_load u.persistent_load = persistent_load
klass_info = u.load() klass_info = u.load()
if isinstance(klass_info, types.TupleType): if isinstance(klass_info, tuple):
if isinstance(klass_info[0], type): if isinstance(klass_info[0], type):
# Unclear: what is the second part of klass_info? # Unclear: what is the second part of klass_info?
klass, xxx = klass_info klass, xxx = klass_info
...@@ -119,13 +118,13 @@ def handle_all_serials(oid, *args): ...@@ -119,13 +118,13 @@ def handle_all_serials(oid, *args):
""" """
d = {} d = {}
for arg in args: for arg in args:
if isinstance(arg, types.StringType): if isinstance(arg, str):
d[oid] = arg d[oid] = arg
elif arg is None: elif arg is None:
pass pass
else: else:
for oid, serial in arg: for oid, serial in arg:
if not isinstance(serial, types.StringType): if not isinstance(serial, str):
raise serial # error from ZEO server raise serial # error from ZEO server
d[oid] = serial d[oid] = serial
return d return d
...@@ -142,14 +141,12 @@ def import_helper(name): ...@@ -142,14 +141,12 @@ def import_helper(name):
return sys.modules[name] return sys.modules[name]
class StorageTestBase(unittest.TestCase): class StorageTestBase(ZODB.tests.util.TestCase):
# It would be simpler if concrete tests didn't need to extend # It would be simpler if concrete tests didn't need to extend
# setUp() and tearDown(). # setUp() and tearDown().
def setUp(self): _storage = None
# You need to override this with a setUp that creates self._storage
self._storage = None
def _close(self): def _close(self):
# You should override this if closing your storage requires additional # You should override this if closing your storage requires additional
...@@ -159,6 +156,7 @@ class StorageTestBase(unittest.TestCase): ...@@ -159,6 +156,7 @@ class StorageTestBase(unittest.TestCase):
def tearDown(self): def tearDown(self):
self._close() self._close()
ZODB.tests.util.TestCase.tearDown(self)
def _dostore(self, oid=None, revid=None, data=None, def _dostore(self, oid=None, revid=None, data=None,
already_pickled=0, user=None, description=None): already_pickled=0, user=None, description=None):
...@@ -176,7 +174,7 @@ class StorageTestBase(unittest.TestCase): ...@@ -176,7 +174,7 @@ class StorageTestBase(unittest.TestCase):
revid = ZERO revid = ZERO
if data is None: if data is None:
data = MinPO(7) data = MinPO(7)
if type(data) == types.IntType: if type(data) == int:
data = MinPO(data) data = MinPO(data)
if not already_pickled: if not already_pickled:
data = zodb_pickle(data) data = zodb_pickle(data)
......
src/ZODB/tests/blob_connection.txt
View file @ 3fd87e79
...@@ -33,10 +33,9 @@ for one of our examples.) ...@@ -33,10 +33,9 @@ for one of our examples.)
>>> import ZODB.FileStorage >>> import ZODB.FileStorage
>>> from ZODB.blob import BlobStorage >>> from ZODB.blob import BlobStorage
>>> from ZODB.DB import DB >>> from ZODB.DB import DB
>>> from tempfile import mkdtemp
>>> base_storage = ZODB.FileStorage.FileStorage( >>> base_storage = ZODB.FileStorage.FileStorage(
... 'BlobTests.fs', create=True) ... 'BlobTests.fs', create=True)
>>> blob_dir = mkdtemp() >>> blob_dir = 'blobs'
>>> blob_storage = BlobStorage(blob_dir, base_storage) >>> blob_storage = BlobStorage(blob_dir, base_storage)
>>> database = DB(blob_storage) >>> database = DB(blob_storage)
...@@ -106,4 +105,3 @@ After testing this, we don't need the storage directory and databases anymore: ...@@ -106,4 +105,3 @@ After testing this, we don't need the storage directory and databases anymore:
>>> database.close() >>> database.close()
>>> database2.close() >>> database2.close()
>>> blob_storage.close() >>> blob_storage.close()
>>> base_storage.cleanup()
src/ZODB/tests/blob_importexport.txt
View file @ 3fd87e79
...@@ -23,11 +23,10 @@ Set up: ...@@ -23,11 +23,10 @@ Set up:
>>> from persistent.mapping import PersistentMapping >>> from persistent.mapping import PersistentMapping
>>> import shutil >>> import shutil
>>> import transaction >>> import transaction
>>> from tempfile import mkdtemp, mktemp >>> storagefile1 = 'Data.fs.1'
>>> storagefile1 = mktemp() >>> blob_dir1 = 'blobs1'
>>> blob_dir1 = mkdtemp() >>> storagefile2 = 'Data.fs.2'
>>> storagefile2 = mktemp() >>> blob_dir2 = 'blobs2'
>>> blob_dir2 = mkdtemp()
We need an database with an undoing blob supporting storage: We need an database with an undoing blob supporting storage:
...@@ -62,7 +61,7 @@ Export our blobs from a database1 connection: ...@@ -62,7 +61,7 @@ Export our blobs from a database1 connection:
>>> conn = root1['blobdata']._p_jar >>> conn = root1['blobdata']._p_jar
>>> oid = root1['blobdata']._p_oid >>> oid = root1['blobdata']._p_oid
>>> exportfile = mktemp() >>> exportfile = 'export'
>>> nothing = connection1.exportFile(oid, exportfile) >>> nothing = connection1.exportFile(oid, exportfile)
Import our exported data into database2: Import our exported data into database2:
......
src/ZODB/tests/blob_layout.txt
View file @ 3fd87e79
...@@ -84,40 +84,37 @@ already been used to create a lawn structure. ...@@ -84,40 +84,37 @@ already been used to create a lawn structure.
1. Non-existing directories will trigger a bushy layout: 1. Non-existing directories will trigger a bushy layout:
>>> import tempfile >>> import os, shutil
>>> import shutil >>> auto_layout_select('blobs')
>>> d = tempfile.mkdtemp()
>>> shutil.rmtree(d)
>>> auto_layout_select(d)
'bushy' 'bushy'
2. Empty directories will trigger a bushy layout too: 2. Empty directories will trigger a bushy layout too:
>>> d = tempfile.mkdtemp() >>> os.mkdir('blobs')
>>> auto_layout_select(d) >>> auto_layout_select('blobs')
'bushy' 'bushy'
3. If the directory contains a marker for the strategy it will be used: 3. If the directory contains a marker for the strategy it will be used:
>>> from ZODB.blob import LAYOUT_MARKER >>> from ZODB.blob import LAYOUT_MARKER
>>> import os.path >>> import os.path
>>> open(os.path.join(d, LAYOUT_MARKER), 'wb').write('bushy') >>> open(os.path.join('blobs', LAYOUT_MARKER), 'wb').write('bushy')
>>> auto_layout_select(d) >>> auto_layout_select('blobs')
'bushy' 'bushy'
>>> open(os.path.join(d, LAYOUT_MARKER), 'wb').write('lawn') >>> open(os.path.join('blobs', LAYOUT_MARKER), 'wb').write('lawn')
>>> auto_layout_select(d) >>> auto_layout_select('blobs')
'lawn' 'lawn'
>>> shutil.rmtree(d) >>> shutil.rmtree('blobs')
4. If the directory does not contain a marker but other files, we assume that 4. If the directory does not contain a marker but other files, we assume that
it was created with an earlier version of the blob implementation and uses our it was created with an earlier version of the blob implementation and uses our
`lawn` layout: `lawn` layout:
>>> d = tempfile.mkdtemp() >>> os.mkdir('blobs')
>>> open(os.path.join(d, '0x0101'), 'wb').write('foo') >>> open(os.path.join('blobs', '0x0101'), 'wb').write('foo')
>>> auto_layout_select(d) >>> auto_layout_select('blobs')
'lawn' 'lawn'
>>> shutil.rmtree(d) >>> shutil.rmtree('blobs')
Directory layout markers Directory layout markers
...@@ -127,8 +124,7 @@ When the file system helper (FSH) is asked to create the directory structure, ...@@ -127,8 +124,7 @@ When the file system helper (FSH) is asked to create the directory structure,
it will leave a marker with the choosen layout if no marker exists yet: it will leave a marker with the choosen layout if no marker exists yet:
>>> from ZODB.blob import FilesystemHelper >>> from ZODB.blob import FilesystemHelper
>>> d = tempfile.mkdtemp() >>> blobs = 'blobs'
>>> blobs = os.path.join(d, 'blobs')
>>> fsh = FilesystemHelper(blobs) >>> fsh = FilesystemHelper(blobs)
>>> fsh.layout_name >>> fsh.layout_name
'bushy' 'bushy'
...@@ -154,7 +150,7 @@ the marker will be used in the future: ...@@ -154,7 +150,7 @@ the marker will be used in the future:
>>> import ZODB.FileStorage >>> import ZODB.FileStorage
>>> from ZODB.blob import BlobStorage >>> from ZODB.blob import BlobStorage
>>> datafs = os.path.join(d, 'data.fs') >>> datafs = 'data.fs'
>>> base_storage = ZODB.FileStorage.FileStorage(datafs) >>> base_storage = ZODB.FileStorage.FileStorage(datafs)
>>> os.mkdir(blobs) >>> os.mkdir(blobs)
...@@ -164,13 +160,14 @@ the marker will be used in the future: ...@@ -164,13 +160,14 @@ the marker will be used in the future:
'lawn' 'lawn'
>>> open(os.path.join(blobs, LAYOUT_MARKER), 'rb').read() >>> open(os.path.join(blobs, LAYOUT_MARKER), 'rb').read()
'lawn' 'lawn'
>>> blob_storage = BlobStorage(blobs, base_storage, layout='bushy') # doctest: +ELLIPSIS >>> blob_storage = BlobStorage('blobs', base_storage, layout='bushy')
... # doctest: +ELLIPSIS
Traceback (most recent call last): Traceback (most recent call last):
ValueError: Directory layout `bushy` selected for blob directory .../blobs/, but marker found for layout `lawn` ValueError: Directory layout `bushy` selected for blob directory .../blobs/, but marker found for layout `lawn`
>>> base_storage.close() >>> base_storage.close()
>>> rmtree(d) >>> rmtree('blobs')
Migrating between directory layouts Migrating between directory layouts
...@@ -189,7 +186,8 @@ The migration is accessible as a library function: ...@@ -189,7 +186,8 @@ The migration is accessible as a library function:
Create a `lawn` directory structure and migrate it to the new `bushy` one: Create a `lawn` directory structure and migrate it to the new `bushy` one:
>>> from ZODB.blob import FilesystemHelper >>> from ZODB.blob import FilesystemHelper
>>> d = tempfile.mkdtemp() >>> d = 'd'
>>> os.mkdir(d)
>>> old = os.path.join(d, 'old') >>> old = os.path.join(d, 'old')
>>> old_fsh = FilesystemHelper(old, 'lawn') >>> old_fsh = FilesystemHelper(old, 'lawn')
>>> old_fsh.create() >>> old_fsh.create()
......
src/ZODB/tests/blob_packing.txt
View file @ 3fd87e79
...@@ -23,11 +23,9 @@ Set up: ...@@ -23,11 +23,9 @@ Set up:
>>> from ZODB.blob import Blob, BlobStorage >>> from ZODB.blob import Blob, BlobStorage
>>> from ZODB import utils >>> from ZODB import utils
>>> from ZODB.DB import DB >>> from ZODB.DB import DB
>>> import shutil
>>> import transaction >>> import transaction
>>> from tempfile import mkdtemp, mktemp >>> storagefile = 'Data.fs'
>>> storagefile = mktemp() >>> blob_dir = 'blobs'
>>> blob_dir = mkdtemp()
A helper method to assure a unique timestamp across multiple platforms: A helper method to assure a unique timestamp across multiple platforms:
...@@ -261,7 +259,8 @@ We can also see, that the flag is set during the pack, by leveraging the ...@@ -261,7 +259,8 @@ We can also see, that the flag is set during the pack, by leveraging the
knowledge that the underlying storage's pack method is also called: knowledge that the underlying storage's pack method is also called:
>>> def dummy_pack(time, ref): >>> def dummy_pack(time, ref):
... print "_blobs_pack_is_in_progress =", blob_storage._blobs_pack_is_in_progress ... print "_blobs_pack_is_in_progress =",
... print blob_storage._blobs_pack_is_in_progress
... return base_pack(time, ref) ... return base_pack(time, ref)
>>> base_pack = base_storage.pack >>> base_pack = base_storage.pack
>>> base_storage.pack = dummy_pack >>> base_storage.pack = dummy_pack
...@@ -270,7 +269,3 @@ knowledge that the underlying storage's pack method is also called: ...@@ -270,7 +269,3 @@ knowledge that the underlying storage's pack method is also called:
>>> blob_storage._blobs_pack_is_in_progress >>> blob_storage._blobs_pack_is_in_progress
False False
>>> base_storage.pack = base_pack >>> base_storage.pack = base_pack
Clean up our blob directory:
>>> rmtree(blob_dir)
src/ZODB/tests/blob_tempdir.txt
View file @ 3fd87e79
...@@ -30,10 +30,9 @@ First, we need a datatabase with blob support:: ...@@ -30,10 +30,9 @@ First, we need a datatabase with blob support::
>>> from ZODB.MappingStorage import MappingStorage >>> from ZODB.MappingStorage import MappingStorage
>>> from ZODB.blob import BlobStorage >>> from ZODB.blob import BlobStorage
>>> from ZODB.DB import DB >>> from ZODB.DB import DB
>>> from tempfile import mkdtemp
>>> import os.path >>> import os.path
>>> base_storage = MappingStorage('test') >>> base_storage = MappingStorage('test')
>>> blob_dir = mkdtemp() >>> blob_dir = os.path.abspath('blobs')
>>> blob_storage = BlobStorage(blob_dir, base_storage) >>> blob_storage = BlobStorage(blob_dir, base_storage)
>>> database = DB(blob_storage) >>> database = DB(blob_storage)
......
src/ZODB/tests/blob_transaction.txt
View file @ 3fd87e79
...@@ -21,10 +21,8 @@ We need a database with a blob supporting storage:: ...@@ -21,10 +21,8 @@ We need a database with a blob supporting storage::
>>> from ZODB.blob import Blob, BlobStorage >>> from ZODB.blob import Blob, BlobStorage
>>> from ZODB.DB import DB >>> from ZODB.DB import DB
>>> import transaction >>> import transaction
>>> import tempfile
>>> from tempfile import mkdtemp
>>> base_storage = MappingStorage("test") >>> base_storage = MappingStorage("test")
>>> blob_dir = mkdtemp() >>> blob_dir = 'blobs'
>>> blob_storage = BlobStorage(blob_dir, base_storage) >>> blob_storage = BlobStorage(blob_dir, base_storage)
>>> database = DB(blob_storage) >>> database = DB(blob_storage)
>>> connection1 = database.open() >>> connection1 = database.open()
...@@ -351,7 +349,7 @@ clean up dirty files: ...@@ -351,7 +349,7 @@ clean up dirty files:
... def tpc_abort(self): ... def tpc_abort(self):
... pass ... pass
>>> base_storage = DummyBaseStorage() >>> base_storage = DummyBaseStorage()
>>> blob_dir2 = mkdtemp() >>> blob_dir2 = 'blobs2'
>>> blob_storage2 = BlobStorage(blob_dir2, base_storage) >>> blob_storage2 = BlobStorage(blob_dir2, base_storage)
>>> committed_blob_dir = blob_storage2.fshelper.getPathForOID(0) >>> committed_blob_dir = blob_storage2.fshelper.getPathForOID(0)
>>> os.makedirs(committed_blob_dir) >>> os.makedirs(committed_blob_dir)
......
src/ZODB/tests/testCache.py
View file @ 3fd87e79
...@@ -29,22 +29,23 @@ import transaction ...@@ -29,22 +29,23 @@ import transaction
import ZODB import ZODB
import ZODB.MappingStorage import ZODB.MappingStorage
from ZODB.tests.MinPO import MinPO from ZODB.tests.MinPO import MinPO
import ZODB.tests.util
from ZODB.utils import p64 from ZODB.utils import p64
from persistent import Persistent from persistent import Persistent
class CacheTestBase(unittest.TestCase): class CacheTestBase(ZODB.tests.util.TestCase):
def setUp(self): def setUp(self):
ZODB.tests.util.TestCase.setUp(self)
store = ZODB.MappingStorage.MappingStorage() store = ZODB.MappingStorage.MappingStorage()
self.db = ZODB.DB(store, self.db = ZODB.DB(store,
cache_size = self.CACHE_SIZE) cache_size = self.CACHE_SIZE)
self.conns = [] self.conns = []
def tearDown(self): def tearDown(self):
for conn in self.conns:
conn.close()
self.db.close() self.db.close()
ZODB.tests.util.TestCase.tearDown(self)
CACHE_SIZE = 20 CACHE_SIZE = 20
...@@ -89,10 +90,8 @@ class CantGetRidOfMe(MinPO): ...@@ -89,10 +90,8 @@ class CantGetRidOfMe(MinPO):
class DBMethods(CacheTestBase): class DBMethods(CacheTestBase):
__super_setUp = CacheTestBase.setUp
def setUp(self): def setUp(self):
self.__super_setUp() CacheTestBase.setUp(self)
for i in range(4): for i in range(4):
self.noodle_new_connection() self.noodle_new_connection()
......
src/ZODB/tests/testConfig.py
View file @ 3fd87e79
...@@ -12,22 +12,18 @@ ...@@ -12,22 +12,18 @@
# #
############################################################################## ##############################################################################
import tempfile
import unittest
import transaction import transaction
import unittest
import ZODB.config import ZODB.config
from ZODB.POSException import ReadOnlyError import ZODB.POSException
import ZODB.tests.util
class ConfigTestBase(ZODB.tests.util.TestCase):
class ConfigTestBase(unittest.TestCase):
def _opendb(self, s): def _opendb(self, s):
return ZODB.config.databaseFromString(s) return ZODB.config.databaseFromString(s)
def tearDown(self):
if getattr(self, "storage", None) is not None:
self.storage.cleanup()
def _test(self, s): def _test(self, s):
db = self._opendb(s) db = self._opendb(s)
self.storage = db._storage self.storage = db._storage
...@@ -58,28 +54,26 @@ class ZODBConfigTest(ConfigTestBase): ...@@ -58,28 +54,26 @@ class ZODBConfigTest(ConfigTestBase):
""") """)
def test_file_config1(self): def test_file_config1(self):
path = tempfile.mktemp()
self._test( self._test(
""" """
<zodb> <zodb>
<filestorage> <filestorage>
path %s path Data.fs
</filestorage> </filestorage>
</zodb> </zodb>
""" % path) """)
def test_file_config2(self): def test_file_config2(self):
path = tempfile.mktemp()
cfg = """ cfg = """
<zodb> <zodb>
<filestorage> <filestorage>
path %s path Data.fs
create false create false
read-only true read-only true
</filestorage> </filestorage>
</zodb> </zodb>
""" % path """
self.assertRaises(ReadOnlyError, self._test, cfg) self.assertRaises(ZODB.POSException.ReadOnlyError, self._test, cfg)
def test_demo_config(self): def test_demo_config(self):
cfg = """ cfg = """
......
src/ZODB/tests/testConnection.py
View file @ 3fd87e79
...@@ -23,19 +23,18 @@ from ZODB.config import databaseFromString ...@@ -23,19 +23,18 @@ from ZODB.config import databaseFromString
from ZODB.utils import p64, u64 from ZODB.utils import p64, u64
from ZODB.tests.warnhook import WarningsHook from ZODB.tests.warnhook import WarningsHook
from zope.interface.verify import verifyObject from zope.interface.verify import verifyObject
import ZODB.tests.util
class ConnectionDotAdd(unittest.TestCase): class ConnectionDotAdd(ZODB.tests.util.TestCase):
def setUp(self): def setUp(self):
ZODB.tests.util.TestCase.setUp(self)
from ZODB.Connection import Connection from ZODB.Connection import Connection
self.db = StubDatabase() self.db = StubDatabase()
self.datamgr = Connection(self.db) self.datamgr = Connection(self.db)
self.datamgr.open() self.datamgr.open()
self.transaction = StubTransaction() self.transaction = StubTransaction()
def tearDown(self):
transaction.abort()
def check_add(self): def check_add(self):
from ZODB.POSException import InvalidObjectReference from ZODB.POSException import InvalidObjectReference
obj = StubObject() obj = StubObject()
...@@ -524,10 +523,11 @@ class _PlayPersistent(Persistent): ...@@ -524,10 +523,11 @@ class _PlayPersistent(Persistent):
def setValueWithSize(self, size=0): self.value = size*' ' def setValueWithSize(self, size=0): self.value = size*' '
__init__ = setValueWithSize __init__ = setValueWithSize
class EstimatedSizeTests(unittest.TestCase): class EstimatedSizeTests(ZODB.tests.util.TestCase):
"""check that size estimations are handled correctly.""" """check that size estimations are handled correctly."""
def setUp(self): def setUp(self):
ZODB.tests.util.TestCase.setUp(self)
self.db = db = databaseFromString("<zodb>\n<mappingstorage/>\n</zodb>") self.db = db = databaseFromString("<zodb>\n<mappingstorage/>\n</zodb>")
self.conn = c = db.open() self.conn = c = db.open()
self.obj = obj = _PlayPersistent() self.obj = obj = _PlayPersistent()
...@@ -545,7 +545,8 @@ class EstimatedSizeTests(unittest.TestCase): ...@@ -545,7 +545,8 @@ class EstimatedSizeTests(unittest.TestCase):
transaction.commit() transaction.commit()
new_size = obj._p_estimated_size new_size = obj._p_estimated_size
self.assert_(new_size > size) self.assert_(new_size > size)
self.assertEqual(cache.total_estimated_size, cache_size + new_size - size) self.assertEqual(cache.total_estimated_size,
cache_size + new_size - size)
def test_size_set_on_write_savepoint(self): def test_size_set_on_write_savepoint(self):
obj, cache = self.obj, self.conn._cache obj, cache = self.obj, self.conn._cache
......
src/ZODB/tests/testDB.py
View file @ 3fd87e79
...@@ -11,36 +11,30 @@ ...@@ -11,36 +11,30 @@
# FOR A PARTICULAR PURPOSE. # FOR A PARTICULAR PURPOSE.
# #
############################################################################## ##############################################################################
from ZODB.tests.MinPO import MinPO
from zope.testing import doctest
import datetime
import os import os
import time import time
import unittest
import datetime
import transaction import transaction
import unittest
from zope.testing import doctest
import ZODB import ZODB
import ZODB.FileStorage import ZODB.tests.util
from ZODB.tests.MinPO import MinPO
# Return total number of connections across all pools in a db._pools. # Return total number of connections across all pools in a db._pools.
def nconn(pools): def nconn(pools):
return sum([len(pool.all) for pool in pools.values()]) return sum([len(pool.all) for pool in pools.values()])
class DBTests(unittest.TestCase): class DBTests(ZODB.tests.util.TestCase):
def setUp(self): def setUp(self):
self.__path = os.path.abspath('test.fs') ZODB.tests.util.TestCase.setUp(self)
store = ZODB.FileStorage.FileStorage(self.__path) self.db = ZODB.DB('test.fs')
self.db = ZODB.DB(store)
def tearDown(self): def tearDown(self):
self.db.close() self.db.close()
for s in ('', '.index', '.lock', '.tmp'): ZODB.tests.util.TestCase.tearDown(self)
if os.path.exists(self.__path+s):
os.remove(self.__path+s)
def dowork(self): def dowork(self):
c = self.db.open() c = self.db.open()
......
src/ZODB/tests/testDemoStorage.py
View file @ 3fd87e79
...@@ -16,7 +16,7 @@ import random ...@@ -16,7 +16,7 @@ import random
import transaction import transaction
from ZODB.DB import DB from ZODB.DB import DB
from zope.testing import doctest from zope.testing import doctest
import zope.testing.setupstack import ZODB.tests.util
import ZODB.utils import ZODB.utils
import ZODB.DemoStorage import ZODB.DemoStorage
from ZODB.tests import ( from ZODB.tests import (
...@@ -44,11 +44,9 @@ class DemoStorageTests( ...@@ -44,11 +44,9 @@ class DemoStorageTests(
): ):
def setUp(self): def setUp(self):
StorageTestBase.StorageTestBase.setUp(self)
self._storage = ZODB.DemoStorage.DemoStorage() self._storage = ZODB.DemoStorage.DemoStorage()
def tearDown(self):
self._storage.close()
def checkOversizeNote(self): def checkOversizeNote(self):
# This base class test checks for the common case where a storage # This base class test checks for the common case where a storage
# doesnt support huge transaction metadata. This storage doesnt # doesnt support huge transaction metadata. This storage doesnt
...@@ -85,13 +83,13 @@ class DemoStorageTests( ...@@ -85,13 +83,13 @@ class DemoStorageTests(
class DemoStorageWrappedBase(DemoStorageTests): class DemoStorageWrappedBase(DemoStorageTests):
def setUp(self): def setUp(self):
import ZODB.DemoStorage StorageTestBase.StorageTestBase.setUp(self)
self._base = self._makeBaseStorage() self._base = self._makeBaseStorage()
self._storage = ZODB.DemoStorage.DemoStorage(base=self._base) self._storage = ZODB.DemoStorage.DemoStorage(base=self._base)
def tearDown(self): def tearDown(self):
self._storage.close()
self._base.close() self._base.close()
StorageTestBase.StorageTestBase.tearDown(self)
def _makeBaseStorage(self): def _makeBaseStorage(self):
raise NotImplementedError raise NotImplementedError
...@@ -112,8 +110,7 @@ class DemoStorageWrappedAroundFileStorage(DemoStorageWrappedBase): ...@@ -112,8 +110,7 @@ class DemoStorageWrappedAroundFileStorage(DemoStorageWrappedBase):
def setUp(test): def setUp(test):
random.seed(0) random.seed(0)
zope.testing.setupstack.setUpDirectory(test) ZODB.tests.util.setUp(test)
zope.testing.setupstack.register(test, transaction.abort)
def testSomeDelegation(): def testSomeDelegation():
r""" r"""
...@@ -158,11 +155,11 @@ def test_suite(): ...@@ -158,11 +155,11 @@ def test_suite():
return unittest.TestSuite(( return unittest.TestSuite((
doctest.DocFileSuite('synchronized.txt'), doctest.DocFileSuite('synchronized.txt'),
doctest.DocTestSuite( doctest.DocTestSuite(
setUp=setUp, tearDown=zope.testing.setupstack.tearDown, setUp=setUp, tearDown=ZODB.tests.util.tearDown,
), ),
doctest.DocFileSuite( doctest.DocFileSuite(
'README.txt', 'README.txt',
setUp=setUp, tearDown=zope.testing.setupstack.tearDown, setUp=setUp, tearDown=ZODB.tests.util.tearDown,
), ),
)) ))
...@@ -172,11 +169,11 @@ def test_suite(): ...@@ -172,11 +169,11 @@ def test_suite():
def test_suite(): def test_suite():
suite = unittest.TestSuite(( suite = unittest.TestSuite((
doctest.DocTestSuite( doctest.DocTestSuite(
setUp=setUp, tearDown=zope.testing.setupstack.tearDown, setUp=setUp, tearDown=ZODB.tests.util.tearDown,
), ),
doctest.DocFileSuite( doctest.DocFileSuite(
'../DemoStorage.test', '../DemoStorage.test',
setUp=setUp, tearDown=zope.testing.setupstack.tearDown, setUp=setUp, tearDown=ZODB.tests.util.tearDown,
), ),
)) ))
suite.addTest(unittest.makeSuite(DemoStorageTests, 'check')) suite.addTest(unittest.makeSuite(DemoStorageTests, 'check'))
......
src/ZODB/tests/testFileStorage.py
View file @ 3fd87e79
...@@ -33,12 +33,9 @@ class BaseFileStorageTests(StorageTestBase.StorageTestBase): ...@@ -33,12 +33,9 @@ class BaseFileStorageTests(StorageTestBase.StorageTestBase):
**kwargs) **kwargs)
def setUp(self): def setUp(self):
StorageTestBase.StorageTestBase.setUp(self)
self.open(create=1) self.open(create=1)
def tearDown(self):
self._storage.close()
self._storage.cleanup()
class FileStorageTests( class FileStorageTests(
BaseFileStorageTests, BaseFileStorageTests,
BasicStorage.BasicStorage, BasicStorage.BasicStorage,
...@@ -296,14 +293,14 @@ class FileStorageRecoveryTest( ...@@ -296,14 +293,14 @@ class FileStorageRecoveryTest(
): ):
def setUp(self): def setUp(self):
StorageTestBase.StorageTestBase.setUp(self)
self._storage = ZODB.FileStorage.FileStorage("Source.fs", create=True) self._storage = ZODB.FileStorage.FileStorage("Source.fs", create=True)
self._dst = ZODB.FileStorage.FileStorage("Dest.fs", create=True) self._dst = ZODB.FileStorage.FileStorage("Dest.fs", create=True)
def tearDown(self): def tearDown(self):
self._storage.close()
self._dst.close() self._dst.close()
self._storage.cleanup() StorageTestBase.StorageTestBase.tearDown(self)
self._dst.cleanup()
def new_dest(self): def new_dest(self):
return ZODB.FileStorage.FileStorage('Dest.fs') return ZODB.FileStorage.FileStorage('Dest.fs')
...@@ -316,24 +313,16 @@ class FileStorageNoRestore(ZODB.FileStorage.FileStorage): ...@@ -316,24 +313,16 @@ class FileStorageNoRestore(ZODB.FileStorage.FileStorage):
raise Exception raise Exception
class FileStorageNoRestoreRecoveryTest( class FileStorageNoRestoreRecoveryTest(FileStorageRecoveryTest):
StorageTestBase.StorageTestBase,
RecoveryStorage.RecoveryStorage,
):
# This test actually verifies a code path of # This test actually verifies a code path of
# BaseStorage.copyTransactionsFrom. For simplicity of implementation, we # BaseStorage.copyTransactionsFrom. For simplicity of implementation, we
# use a FileStorage deprived of its restore method. # use a FileStorage deprived of its restore method.
def setUp(self): def setUp(self):
StorageTestBase.StorageTestBase.setUp(self)
self._storage = FileStorageNoRestore("Source.fs", create=True) self._storage = FileStorageNoRestore("Source.fs", create=True)
self._dst = FileStorageNoRestore("Dest.fs", create=True) self._dst = FileStorageNoRestore("Dest.fs", create=True)
def tearDown(self):
self._storage.close()
self._dst.close()
self._storage.cleanup()
self._dst.cleanup()
def new_dest(self): def new_dest(self):
return FileStorageNoRestore('Dest.fs') return FileStorageNoRestore('Dest.fs')
......
src/ZODB/tests/testMappingStorage.py
View file @ 3fd87e79
...@@ -40,11 +40,9 @@ class MappingStorageTests( ...@@ -40,11 +40,9 @@ class MappingStorageTests(
): ):
def setUp(self): def setUp(self):
StorageTestBase.StorageTestBase.setUp(self, )
self._storage = ZODB.MappingStorage.MappingStorage() self._storage = ZODB.MappingStorage.MappingStorage()
def tearDown(self):
self._storage.close()
def checkOversizeNote(self): def checkOversizeNote(self):
# This base class test checks for the common case where a storage # This base class test checks for the common case where a storage
# doesnt support huge transaction metadata. This storage doesnt # doesnt support huge transaction metadata. This storage doesnt
......
src/ZODB/tests/testRecover.py
View file @ 3fd87e79
...@@ -17,38 +17,38 @@ import base64 ...@@ -17,38 +17,38 @@ import base64
import os import os
import random import random
import sys import sys
import tempfile
import unittest import unittest
import StringIO import StringIO
import ZODB import ZODB
import ZODB.tests.util
from ZODB.FileStorage import FileStorage from ZODB.FileStorage import FileStorage
import ZODB.fsrecover import ZODB.fsrecover
from persistent.mapping import PersistentMapping from persistent.mapping import PersistentMapping
import transaction import transaction
class RecoverTest(unittest.TestCase): class RecoverTest(ZODB.tests.util.TestCase):
level = 2 level = 2
path = None path = None
def setUp(self): def setUp(self):
self.path = tempfile.mktemp(suffix=".fs") ZODB.tests.util.TestCase.setUp(self)
self.path = 'source.fs'
self.storage = FileStorage(self.path) self.storage = FileStorage(self.path)
self.populate() self.populate()
self.dest = tempfile.mktemp(suffix=".fs") self.dest = 'dest.fs'
self.recovered = None self.recovered = None
def tearDown(self): def tearDown(self):
self.storage.close() self.storage.close()
if self.recovered is not None: if self.recovered is not None:
self.recovered.close() self.recovered.close()
self.storage.cleanup()
temp = FileStorage(self.dest) temp = FileStorage(self.dest)
temp.close() temp.close()
temp.cleanup() ZODB.tests.util.TestCase.tearDown(self)
def populate(self): def populate(self):
db = ZODB.DB(self.storage) db = ZODB.DB(self.storage)
......
src/ZODB/tests/testZODB.py
View file @ 3fd87e79
...@@ -20,6 +20,7 @@ import ZODB.MappingStorage ...@@ -20,6 +20,7 @@ import ZODB.MappingStorage
from ZODB.POSException import ReadConflictError, ConflictError from ZODB.POSException import ReadConflictError, ConflictError
from ZODB.POSException import TransactionFailedError from ZODB.POSException import TransactionFailedError
from ZODB.tests.warnhook import WarningsHook from ZODB.tests.warnhook import WarningsHook
import ZODB.tests.util
from persistent import Persistent from persistent import Persistent
from persistent.mapping import PersistentMapping from persistent.mapping import PersistentMapping
...@@ -38,13 +39,18 @@ class DecoyIndependent(Persistent): ...@@ -38,13 +39,18 @@ class DecoyIndependent(Persistent):
def _p_independent(self): def _p_independent(self):
return 0 return 0
class ZODBTests(unittest.TestCase): class ZODBTests(ZODB.tests.util.TestCase):
def setUp(self): def setUp(self):
ZODB.tests.util.TestCase.setUp(self)
self._storage = ZODB.FileStorage.FileStorage( self._storage = ZODB.FileStorage.FileStorage(
'ZODBTests.fs', create=1) 'ZODBTests.fs', create=1)
self._db = ZODB.DB(self._storage) self._db = ZODB.DB(self._storage)
def tearDown(self):
self._db.close()
ZODB.tests.util.TestCase.tearDown(self)
def populate(self): def populate(self):
transaction.begin() transaction.begin()
conn = self._db.open() conn = self._db.open()
...@@ -56,10 +62,6 @@ class ZODBTests(unittest.TestCase): ...@@ -56,10 +62,6 @@ class ZODBTests(unittest.TestCase):
transaction.commit() transaction.commit()
conn.close() conn.close()
def tearDown(self):
self._db.close()
self._storage.cleanup()
def checkExportImport(self, abort_it=False): def checkExportImport(self, abort_it=False):
self.populate() self.populate()
conn = self._db.open() conn = self._db.open()
...@@ -431,9 +433,10 @@ class ZODBTests(unittest.TestCase): ...@@ -431,9 +433,10 @@ class ZODBTests(unittest.TestCase):
transaction.abort() transaction.abort()
conn.close() conn.close()
class ReadConflictTests(unittest.TestCase): class ReadConflictTests(ZODB.tests.util.TestCase):
def setUp(self): def setUp(self):
ZODB.tests.utils.TestCase.setUp(self)
self._storage = ZODB.MappingStorage.MappingStorage() self._storage = ZODB.MappingStorage.MappingStorage()
def readConflict(self, shouldFail=True): def readConflict(self, shouldFail=True):
......
src/ZODB/tests/test_fsdump.py
View file @ 3fd87e79
...@@ -11,17 +11,13 @@ ...@@ -11,17 +11,13 @@
# FOR A PARTICULAR PURPOSE. # FOR A PARTICULAR PURPOSE.
# #
############################################################################## ##############################################################################
r""" r"""
fsdump test fsdump test
=========== ===========
Let's get a temp file path to work with first. Let's get a path to work with first.
>>> import tempfile >>> path = 'Data.fs'
>>> path = tempfile.mktemp('.fs', 'Data')
>>> print 'path:', path #doctest: +ELLIPSIS
path: ...Data...fs
More imports. More imports.
...@@ -69,10 +65,12 @@ Now we see two transactions and two changed objects. ...@@ -69,10 +65,12 @@ Now we see two transactions and two changed objects.
Clean up. Clean up.
>>> st.close() >>> st.close()
>>> st.cleanup() # remove .fs, .index, etc
""" """
from zope.testing import doctest from zope.testing import doctest
import zope.testing.setupstack
def test_suite(): def test_suite():
return doctest.DocTestSuite() return doctest.DocTestSuite(
setUp=zope.testing.setupstack.setUpDirectory,
tearDown=zope.testing.setupstack.tearDown)
src/ZODB/tests/test_storage.py
View file @ 3fd87e79
...@@ -154,6 +154,7 @@ class MinimalTestSuite(StorageTestBase.StorageTestBase, ...@@ -154,6 +154,7 @@ class MinimalTestSuite(StorageTestBase.StorageTestBase,
): ):
def setUp(self): def setUp(self):
StorageTestBase.StorageTestBase.setUp(self)
self._storage = MinimalMemoryStorage() self._storage = MinimalMemoryStorage()
# we don't implement undo # we don't implement undo
......
src/ZODB/tests/testblob.py
View file @ 3fd87e79
...@@ -32,7 +32,6 @@ import stat ...@@ -32,7 +32,6 @@ import stat
import struct import struct
import sys import sys
import sys import sys
import tempfile
import time import time
import transaction import transaction
import unittest import unittest
...@@ -42,7 +41,6 @@ import ZODB.interfaces ...@@ -42,7 +41,6 @@ import ZODB.interfaces
import ZODB.tests.IteratorStorage import ZODB.tests.IteratorStorage
import ZODB.tests.util import ZODB.tests.util
import zope.testing.renormalizing import zope.testing.renormalizing
import zope.testing.setupstack
def new_time(): def new_time():
...@@ -60,48 +58,31 @@ def new_time(): ...@@ -60,48 +58,31 @@ def new_time():
return new_time return new_time
class BlobConfigTestBase(ConfigTestBase): class ZODBBlobConfigTest(ConfigTestBase):
def setUp(self):
super(BlobConfigTestBase, self).setUp()
self.blob_dir = tempfile.mkdtemp()
def tearDown(self):
super(BlobConfigTestBase, self).tearDown()
shutil.rmtree(self.blob_dir)
class ZODBBlobConfigTest(BlobConfigTestBase):
def test_map_config1(self): def test_map_config1(self):
self._test( self._test(
""" """
<zodb> <zodb>
<blobstorage> <blobstorage>
blob-dir %s blob-dir blobs
<mappingstorage/> <mappingstorage/>
</blobstorage> </blobstorage>
</zodb> </zodb>
""" % self.blob_dir) """)
def test_file_config1(self): def test_file_config1(self):
path = tempfile.mktemp()
self._test( self._test(
""" """
<zodb> <zodb>
<blobstorage> <blobstorage>
blob-dir %s blob-dir blobs
<filestorage> <filestorage>
path %s path Data.fs
</filestorage> </filestorage>
</blobstorage> </blobstorage>
</zodb> </zodb>
""" %(self.blob_dir, path)) """)
os.unlink(path)
os.unlink(path+".index")
os.unlink(path+".tmp")
def test_blob_dir_needed(self): def test_blob_dir_needed(self):
self.assertRaises(ZConfig.ConfigurationSyntaxError, self.assertRaises(ZConfig.ConfigurationSyntaxError,
...@@ -115,20 +96,7 @@ class ZODBBlobConfigTest(BlobConfigTestBase): ...@@ -115,20 +96,7 @@ class ZODBBlobConfigTest(BlobConfigTestBase):
""") """)
class BlobTests(unittest.TestCase): class BlobCloneTests(ZODB.tests.util.TestCase):
def setUp(self):
self.test_dir = tempfile.mkdtemp()
self.here = os.getcwd()
os.chdir(self.test_dir)
self.storagefile = 'Data.fs'
self.blob_dir = 'blobs'
def tearDown(self):
os.chdir(self.here)
ZODB.blob.remove_committed_dir(self.test_dir)
class BlobCloneTests(BlobTests):
def testDeepCopyCanInvalidate(self): def testDeepCopyCanInvalidate(self):
""" """
...@@ -136,8 +104,8 @@ class BlobCloneTests(BlobTests): ...@@ -136,8 +104,8 @@ class BlobCloneTests(BlobTests):
readers and writers values in cloned objects (see readers and writers values in cloned objects (see
http://mail.zope.org/pipermail/zodb-dev/2008-August/012054.html) http://mail.zope.org/pipermail/zodb-dev/2008-August/012054.html)
""" """
base_storage = FileStorage(self.storagefile) base_storage = FileStorage('Data.fs')
blob_storage = BlobStorage(self.blob_dir, base_storage) blob_storage = BlobStorage('blobs', base_storage)
database = DB(blob_storage) database = DB(blob_storage)
connection = database.open() connection = database.open()
root = connection.root() root = connection.root()
...@@ -161,11 +129,11 @@ class BlobCloneTests(BlobTests): ...@@ -161,11 +129,11 @@ class BlobCloneTests(BlobTests):
database.close() database.close()
class BlobUndoTests(BlobTests): class BlobUndoTests(ZODB.tests.util.TestCase):
def testUndoWithoutPreviousVersion(self): def testUndoWithoutPreviousVersion(self):
base_storage = FileStorage(self.storagefile) base_storage = FileStorage('Data.fs')
blob_storage = BlobStorage(self.blob_dir, base_storage) blob_storage = BlobStorage('blobs', base_storage)
database = DB(blob_storage) database = DB(blob_storage)
connection = database.open() connection = database.open()
root = connection.root() root = connection.root()
...@@ -181,8 +149,8 @@ class BlobUndoTests(BlobTests): ...@@ -181,8 +149,8 @@ class BlobUndoTests(BlobTests):
database.close() database.close()
def testUndo(self): def testUndo(self):
base_storage = FileStorage(self.storagefile) base_storage = FileStorage('Data.fs')
blob_storage = BlobStorage(self.blob_dir, base_storage) blob_storage = BlobStorage('blobs', base_storage)
database = DB(blob_storage) database = DB(blob_storage)
connection = database.open() connection = database.open()
root = connection.root() root = connection.root()
...@@ -205,8 +173,8 @@ class BlobUndoTests(BlobTests): ...@@ -205,8 +173,8 @@ class BlobUndoTests(BlobTests):
database.close() database.close()
def testUndoAfterConsumption(self): def testUndoAfterConsumption(self):
base_storage = FileStorage(self.storagefile) base_storage = FileStorage('Data.fs')
blob_storage = BlobStorage(self.blob_dir, base_storage) blob_storage = BlobStorage('blobs', base_storage)
database = DB(blob_storage) database = DB(blob_storage)
connection = database.open() connection = database.open()
root = connection.root() root = connection.root()
...@@ -231,8 +199,8 @@ class BlobUndoTests(BlobTests): ...@@ -231,8 +199,8 @@ class BlobUndoTests(BlobTests):
database.close() database.close()
def testRedo(self): def testRedo(self):
base_storage = FileStorage(self.storagefile) base_storage = FileStorage('Data.fs')
blob_storage = BlobStorage(self.blob_dir, base_storage) blob_storage = BlobStorage('bobs', base_storage)
database = DB(blob_storage) database = DB(blob_storage)
connection = database.open() connection = database.open()
root = connection.root() root = connection.root()
...@@ -263,8 +231,8 @@ class BlobUndoTests(BlobTests): ...@@ -263,8 +231,8 @@ class BlobUndoTests(BlobTests):
database.close() database.close()
def testRedoOfCreation(self): def testRedoOfCreation(self):
base_storage = FileStorage(self.storagefile) base_storage = FileStorage('Data.fs')
blob_storage = BlobStorage(self.blob_dir, base_storage) blob_storage = BlobStorage('blobs', base_storage)
database = DB(blob_storage) database = DB(blob_storage)
connection = database.open() connection = database.open()
root = connection.root() root = connection.root()
...@@ -288,12 +256,11 @@ class BlobUndoTests(BlobTests): ...@@ -288,12 +256,11 @@ class BlobUndoTests(BlobTests):
database.close() database.close()
class RecoveryBlobStorage(unittest.TestCase, class RecoveryBlobStorage(ZODB.tests.util.TestCase,
ZODB.tests.IteratorStorage.IteratorDeepCompare): ZODB.tests.IteratorStorage.IteratorDeepCompare):
def setUp(self): def setUp(self):
self.globs = {} ZODB.tests.util.TestCase.setUp(self)
zope.testing.setupstack.setUpDirectory(self)
self._storage = BlobStorage( self._storage = BlobStorage(
'src_blobs', ZODB.FileStorage.FileStorage("Source.fs", create=True)) 'src_blobs', ZODB.FileStorage.FileStorage("Source.fs", create=True))
self._dst = BlobStorage( self._dst = BlobStorage(
...@@ -302,7 +269,7 @@ class RecoveryBlobStorage(unittest.TestCase, ...@@ -302,7 +269,7 @@ class RecoveryBlobStorage(unittest.TestCase,
def tearDown(self): def tearDown(self):
self._storage.close() self._storage.close()
self._dst.close() self._dst.close()
zope.testing.setupstack.tearDown(self) ZODB.tests.util.TestCase.tearDown(self)
# Requires a setUp() that creates a self._dst destination storage # Requires a setUp() that creates a self._dst destination storage
def testSimpleBlobRecovery(self): def testSimpleBlobRecovery(self):
...@@ -367,10 +334,8 @@ def commit_from_wrong_partition(): ...@@ -367,10 +334,8 @@ def commit_from_wrong_partition():
>>> from ZODB.MappingStorage import MappingStorage >>> from ZODB.MappingStorage import MappingStorage
>>> from ZODB.blob import BlobStorage >>> from ZODB.blob import BlobStorage
>>> from ZODB.DB import DB >>> from ZODB.DB import DB
>>> from tempfile import mkdtemp
>>> base_storage = MappingStorage("test") >>> base_storage = MappingStorage("test")
>>> blob_dir = mkdtemp() >>> blob_storage = BlobStorage('blobs', base_storage)
>>> blob_storage = BlobStorage(blob_dir, base_storage)
>>> database = DB(blob_storage) >>> database = DB(blob_storage)
>>> connection = database.open() >>> connection = database.open()
>>> root = connection.root() >>> root = connection.root()
...@@ -417,11 +382,9 @@ def packing_with_uncommitted_data_non_undoing(): ...@@ -417,11 +382,9 @@ def packing_with_uncommitted_data_non_undoing():
>>> from ZODB.blob import BlobStorage >>> from ZODB.blob import BlobStorage
>>> from ZODB.DB import DB >>> from ZODB.DB import DB
>>> from ZODB.serialize import referencesf >>> from ZODB.serialize import referencesf
>>> from tempfile import mkdtemp
>>> base_storage = MappingStorage("test") >>> base_storage = MappingStorage("test")
>>> blob_dir = mkdtemp() >>> blob_storage = BlobStorage('blobs', base_storage)
>>> blob_storage = BlobStorage(blob_dir, base_storage)
>>> database = DB(blob_storage) >>> database = DB(blob_storage)
>>> connection = database.open() >>> connection = database.open()
>>> root = connection.root() >>> root = connection.root()
...@@ -435,8 +398,6 @@ def packing_with_uncommitted_data_non_undoing(): ...@@ -435,8 +398,6 @@ def packing_with_uncommitted_data_non_undoing():
Clean up: Clean up:
>>> database.close() >>> database.close()
>>> import shutil
>>> shutil.rmtree(blob_dir)
""" """
...@@ -453,12 +414,9 @@ def packing_with_uncommitted_data_undoing(): ...@@ -453,12 +414,9 @@ def packing_with_uncommitted_data_undoing():
>>> from ZODB.blob import BlobStorage >>> from ZODB.blob import BlobStorage
>>> from ZODB.DB import DB >>> from ZODB.DB import DB
>>> from ZODB.serialize import referencesf >>> from ZODB.serialize import referencesf
>>> from tempfile import mkdtemp, mktemp
>>> storagefile = mktemp() >>> base_storage = FileStorage('Data.fs')
>>> base_storage = FileStorage(storagefile) >>> blob_storage = BlobStorage('blobs', base_storage)
>>> blob_dir = mkdtemp()
>>> blob_storage = BlobStorage(blob_dir, base_storage)
>>> database = DB(blob_storage) >>> database = DB(blob_storage)
>>> connection = database.open() >>> connection = database.open()
>>> root = connection.root() >>> root = connection.root()
...@@ -472,14 +430,6 @@ def packing_with_uncommitted_data_undoing(): ...@@ -472,14 +430,6 @@ def packing_with_uncommitted_data_undoing():
Clean up: Clean up:
>>> database.close() >>> database.close()
>>> import shutil
>>> shutil.rmtree(blob_dir)
>>> os.unlink(storagefile)
>>> os.unlink(storagefile+".index")
>>> os.unlink(storagefile+".tmp")
""" """
...@@ -490,33 +440,29 @@ def secure_blob_directory(): ...@@ -490,33 +440,29 @@ def secure_blob_directory():
>>> from ZODB.FileStorage.FileStorage import FileStorage >>> from ZODB.FileStorage.FileStorage import FileStorage
>>> from ZODB.blob import BlobStorage >>> from ZODB.blob import BlobStorage
>>> from tempfile import mkdtemp
>>> import os.path >>> import os.path
>>> working_directory = mkdtemp() >>> base_storage = FileStorage('Data.fs')
>>> base_storage = FileStorage(os.path.join(working_directory, 'Data.fs')) >>> blob_storage = BlobStorage('blobs', base_storage)
>>> blob_storage = BlobStorage(os.path.join(working_directory, 'blobs'),
... base_storage)
Two directories are created: Two directories are created:
>>> blob_dir = os.path.join(working_directory, 'blobs') >>> os.path.isdir('blobs')
>>> os.path.isdir(blob_dir)
True True
>>> tmp_dir = os.path.join(blob_dir, 'tmp') >>> tmp_dir = os.path.join('blobs', 'tmp')
>>> os.path.isdir(tmp_dir) >>> os.path.isdir(tmp_dir)
True True
They are only accessible by the owner: They are only accessible by the owner:
>>> oct(os.stat(blob_dir).st_mode) >>> oct(os.stat('blobs').st_mode)
'040700' '040700'
>>> oct(os.stat(tmp_dir).st_mode) >>> oct(os.stat(tmp_dir).st_mode)
'040700' '040700'
These settings are recognized as secure: These settings are recognized as secure:
>>> blob_storage.fshelper.isSecure(blob_dir) >>> blob_storage.fshelper.isSecure('blobs')
True True
>>> blob_storage.fshelper.isSecure(tmp_dir) >>> blob_storage.fshelper.isSecure(tmp_dir)
True True
...@@ -531,8 +477,6 @@ def secure_blob_directory(): ...@@ -531,8 +477,6 @@ def secure_blob_directory():
Clean up: Clean up:
>>> blob_storage.close() >>> blob_storage.close()
>>> import shutil
>>> shutil.rmtree(working_directory)
""" """
...@@ -554,12 +498,9 @@ def loadblob_tmpstore(): ...@@ -554,12 +498,9 @@ def loadblob_tmpstore():
>>> from ZODB.blob import BlobStorage >>> from ZODB.blob import BlobStorage
>>> from ZODB.DB import DB >>> from ZODB.DB import DB
>>> from ZODB.serialize import referencesf >>> from ZODB.serialize import referencesf
>>> from tempfile import mkdtemp, mktemp
>>> storagefile = mktemp() >>> base_storage = FileStorage('Data.fs')
>>> base_storage = FileStorage(storagefile) >>> blob_storage = BlobStorage('blobs', base_storage)
>>> blob_dir = mkdtemp()
>>> blob_storage = BlobStorage(blob_dir, base_storage)
>>> database = DB(blob_storage) >>> database = DB(blob_storage)
>>> connection = database.open() >>> connection = database.open()
>>> root = connection.root() >>> root = connection.root()
...@@ -587,12 +528,6 @@ def loadblob_tmpstore(): ...@@ -587,12 +528,6 @@ def loadblob_tmpstore():
Clean up: Clean up:
>>> database.close() >>> database.close()
>>> import shutil
>>> rmtree(blob_dir)
>>> os.unlink(storagefile)
>>> os.unlink(storagefile+".index")
>>> os.unlink(storagefile+".tmp")
""" """
def is_blob_record(): def is_blob_record():
...@@ -639,7 +574,7 @@ def do_not_depend_on_cwd(): ...@@ -639,7 +574,7 @@ def do_not_depend_on_cwd():
""" """
def setUp(test): def setUp(test):
zope.testing.setupstack.setUpDirectory(test) ZODB.tests.util.setUp(test)
test.globs['rmtree'] = zope.testing.setupstack.rmtree test.globs['rmtree'] = zope.testing.setupstack.rmtree
def test_suite(): def test_suite():
......
src/ZODB/tests/testconflictresolution.py
View file @ 3fd87e79
...@@ -15,18 +15,19 @@ ...@@ -15,18 +15,19 @@
$Id$ $Id$
""" """
import unittest import unittest
from zope.testing import doctest, module, setupstack from zope.testing import doctest, module
import ZODB.tests.util
def setUp(test): def setUp(test):
ZODB.tests.util.setUp(test)
module.setUp(test, 'ConflictResolution_txt') module.setUp(test, 'ConflictResolution_txt')
setupstack.setUpDirectory(test)
def tearDown(test): def tearDown(test):
test.globs['db'].close() test.globs['db'].close()
test.globs['db1'].close() test.globs['db1'].close()
test.globs['db2'].close() test.globs['db2'].close()
module.tearDown(test) module.tearDown(test)
setupstack.tearDown(test) ZODB.tests.util.tearDown(test)
def test_suite(): def test_suite():
return unittest.TestSuite(( return unittest.TestSuite((
......
src/ZODB/tests/testfsoids.py
View file @ 3fd87e79
...@@ -16,12 +16,9 @@ r""" ...@@ -16,12 +16,9 @@ r"""
fsoids test, of the workhorse fsoids.Trace class fsoids test, of the workhorse fsoids.Trace class
================================================ ================================================
Let's get a temp file path to work with first. Let's get a path to work with first.
>>> import tempfile >>> path = 'Data.fs'
>>> path = tempfile.mktemp('.fs', 'Data')
>>> print 'path:', path #doctest: +ELLIPSIS
path: ...Data...fs
More imports. More imports.
......
src/ZODB/tests/testhistoricalconnections.py
View file @ 3fd87e79
...@@ -16,19 +16,21 @@ $Id$ ...@@ -16,19 +16,21 @@ $Id$
""" """
import unittest import unittest
from zope.testing import doctest, module from zope.testing import doctest, module
import ZODB.tests.util
def setUp(test): def setUp(test):
ZODB.tests.util.setUp(test)
module.setUp(test, 'historical_connections_txt') module.setUp(test, 'historical_connections_txt')
def tearDown(test): def tearDown(test):
test.globs['db'].close() test.globs['db'].close()
test.globs['db2'].close() test.globs['db2'].close()
test.globs['storage'].close() test.globs['storage'].close()
test.globs['storage'].cleanup()
# the DB class masks the module because of __init__ shenanigans # the DB class masks the module because of __init__ shenanigans
DB_module = __import__('ZODB.DB', globals(), locals(), ['chicken']) DB_module = __import__('ZODB.DB', globals(), locals(), ['chicken'])
DB_module.time = test.globs['original_time'] DB_module.time = test.globs['original_time']
module.tearDown(test) module.tearDown(test)
ZODB.tests.util.tearDown(test)
def test_suite(): def test_suite():
return unittest.TestSuite(( return unittest.TestSuite((
......
src/ZODB/tests/testpersistentclass.py
View file @ 3fd87e79
...@@ -52,14 +52,15 @@ class FakeModule: ...@@ -52,14 +52,15 @@ class FakeModule:
def setUp(test): def setUp(test):
ZODB.tests.util.setUp(test)
test.globs['some_database'] = ZODB.tests.util.DB() test.globs['some_database'] = ZODB.tests.util.DB()
module = FakeModule('ZODB.persistentclass_txt', test.globs) module = FakeModule('ZODB.persistentclass_txt', test.globs)
sys.modules[module.__name__] = module sys.modules[module.__name__] = module
def tearDown(test): def tearDown(test):
transaction.abort()
test.globs['some_database'].close() test.globs['some_database'].close()
del sys.modules['ZODB.persistentclass_txt'] del sys.modules['ZODB.persistentclass_txt']
ZODB.tests.util.tearDown(test)
def test_suite(): def test_suite():
return unittest.TestSuite(( return unittest.TestSuite((
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7