From 78115efa14c3673f92a764595f696e01199d717b Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Tue, 11 Jan 2022 18:35:36 -0500
Subject: [PATCH] Put the read-only reset into a renamed
`cleanup_storage_server`
---
src/_zkapauthorizer/tests/storage_common.py | 8 ++++++--
src/_zkapauthorizer/tests/test_storage_protocol.py | 4 ++--
src/_zkapauthorizer/tests/test_storage_server.py | 7 ++-----
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/_zkapauthorizer/tests/storage_common.py b/src/_zkapauthorizer/tests/storage_common.py
index 6538b3b..39d85d2 100644
--- a/src/_zkapauthorizer/tests/storage_common.py
+++ b/src/_zkapauthorizer/tests/storage_common.py
@@ -36,13 +36,17 @@ from .strategies import bytes_for_share # Not really a strategy...
LEASE_INTERVAL = 60 * 60 * 24 * 31
-def cleanup_storage_server(storage_server):
+def reset_storage_server(storage_server):
"""
- Delete all of the shares held by the given storage server.
+ Restore a storage server to a default state. This includes
+ deleting all of the shares it holds.
:param allmydata.storage.server.StorageServer storage_server: The storage
server with some on-disk shares to delete.
"""
+ # A storage server is read-write by default.
+ storage_server.readonly_storage = False
+
starts = [
FilePath(storage_server.sharedir),
FilePath(storage_server.corruption_advisory_dir),
diff --git a/src/_zkapauthorizer/tests/test_storage_protocol.py b/src/_zkapauthorizer/tests/test_storage_protocol.py
index ed54432..10e30c0 100644
--- a/src/_zkapauthorizer/tests/test_storage_protocol.py
+++ b/src/_zkapauthorizer/tests/test_storage_protocol.py
@@ -61,10 +61,10 @@ from .foolscap import LocalRemote
from .matchers import matches_spent_passes, matches_version_dictionary
from .storage_common import (
LEASE_INTERVAL,
- cleanup_storage_server,
get_passes,
pass_factory,
privacypass_passes,
+ reset_storage_server,
whitebox_write_sparse_share,
write_toy_shares,
)
@@ -191,7 +191,7 @@ class ShareTests(TestCase):
self.spending_recorder.reset()
# And clean out any shares that might confuse things.
- cleanup_storage_server(self.anonymous_storage_server)
+ reset_storage_server(self.anonymous_storage_server)
def test_get_version(self):
"""
diff --git a/src/_zkapauthorizer/tests/test_storage_server.py b/src/_zkapauthorizer/tests/test_storage_server.py
index a085bc5..a0237bb 100644
--- a/src/_zkapauthorizer/tests/test_storage_server.py
+++ b/src/_zkapauthorizer/tests/test_storage_server.py
@@ -45,7 +45,7 @@ from ..storage_common import (
from .common import skipIf
from .fixtures import AnonymousStorageServer
from .matchers import matches_spent_passes, raises
-from .storage_common import cleanup_storage_server, get_passes, write_toy_shares
+from .storage_common import get_passes, reset_storage_server, write_toy_shares
from .strategies import (
lease_cancel_secrets,
lease_renew_secrets,
@@ -222,10 +222,7 @@ class PassValidationTests(TestCase):
# Hypothesis and testtools fixtures don't play nicely together in a
# way that allows us to just move everything from `setUp` into this
# method.
- cleanup_storage_server(self.anonymous_storage_server)
- # One of the tests makes the server read-only partway through. Make
- # sure that doesn't leak into other examples.
- self.anonymous_storage_server.readonly_storage = False
+ reset_storage_server(self.anonymous_storage_server)
self.spending_recorder.reset()
--
GitLab