Commit e73a6968 authored by Jim Fulton's avatar Jim Fulton

Removed unused berkeley storage tests.

Removed test levels. Test levels are an invitation to inadvertently
not run tests.
parent 08dd6442
...@@ -35,14 +35,6 @@ class FileStorageConfig: ...@@ -35,14 +35,6 @@ class FileStorageConfig:
create and 'yes' or 'no', create and 'yes' or 'no',
read_only and 'yes' or 'no') read_only and 'yes' or 'no')
class BerkeleyStorageConfig:
def getConfig(self, path, create, read_only):
return """\
<fullstorage 1>
envdir %s
read-only %s
</fullstorage>""" % (path, read_only and "yes" or "no")
class MappingStorageConfig: class MappingStorageConfig:
def getConfig(self, path, create, read_only): def getConfig(self, path, create, read_only):
return """<mappingstorage 1/>""" return """<mappingstorage 1/>"""
...@@ -54,7 +46,6 @@ class FileStorageConnectionTests( ...@@ -54,7 +46,6 @@ class FileStorageConnectionTests(
InvalidationTests.InvalidationTests InvalidationTests.InvalidationTests
): ):
"""FileStorage-specific connection tests.""" """FileStorage-specific connection tests."""
level = 2
class FileStorageReconnectionTests( class FileStorageReconnectionTests(
FileStorageConfig, FileStorageConfig,
...@@ -62,48 +53,18 @@ class FileStorageReconnectionTests( ...@@ -62,48 +53,18 @@ class FileStorageReconnectionTests(
): ):
"""FileStorage-specific re-connection tests.""" """FileStorage-specific re-connection tests."""
# Run this at level 1 because MappingStorage can't do reconnection tests # Run this at level 1 because MappingStorage can't do reconnection tests
level = 1
class FileStorageInvqTests( class FileStorageInvqTests(
FileStorageConfig, FileStorageConfig,
ConnectionTests.InvqTests ConnectionTests.InvqTests
): ):
"""FileStorage-specific invalidation queue tests.""" """FileStorage-specific invalidation queue tests."""
level = 1
class FileStorageTimeoutTests( class FileStorageTimeoutTests(
FileStorageConfig, FileStorageConfig,
ConnectionTests.TimeoutTests ConnectionTests.TimeoutTests
): ):
level = 2 pass
class BDBConnectionTests(
BerkeleyStorageConfig,
ConnectionTests.ConnectionTests,
InvalidationTests.InvalidationTests
):
"""Berkeley storage connection tests."""
level = 2
class BDBReconnectionTests(
BerkeleyStorageConfig,
ConnectionTests.ReconnectionTests
):
"""Berkeley storage re-connection tests."""
level = 2
class BDBInvqTests(
BerkeleyStorageConfig,
ConnectionTests.InvqTests
):
"""Berkeley storage invalidation queue tests."""
level = 2
class BDBTimeoutTests(
BerkeleyStorageConfig,
ConnectionTests.TimeoutTests
):
level = 2
class MappingStorageConnectionTests( class MappingStorageConnectionTests(
...@@ -111,7 +72,6 @@ class MappingStorageConnectionTests( ...@@ -111,7 +72,6 @@ class MappingStorageConnectionTests(
ConnectionTests.ConnectionTests ConnectionTests.ConnectionTests
): ):
"""Mapping storage connection tests.""" """Mapping storage connection tests."""
level = 1
# The ReconnectionTests can't work with MappingStorage because it's only an # The ReconnectionTests can't work with MappingStorage because it's only an
# in-memory storage and has no persistent state. # in-memory storage and has no persistent state.
...@@ -120,10 +80,8 @@ class MappingStorageTimeoutTests( ...@@ -120,10 +80,8 @@ class MappingStorageTimeoutTests(
MappingStorageConfig, MappingStorageConfig,
ConnectionTests.TimeoutTests ConnectionTests.TimeoutTests
): ):
level = 1 pass
test_classes = [FileStorageConnectionTests, test_classes = [FileStorageConnectionTests,
FileStorageReconnectionTests, FileStorageReconnectionTests,
FileStorageInvqTests, FileStorageInvqTests,
......
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