From 79e8e8390044b93009d6f7e78d558e928f64a190 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Tue, 8 Oct 2019 09:14:17 -0400
Subject: [PATCH] Factor AnonymousStorageServer fixture out for re-use
---
src/_zkapauthorizer/tests/fixtures.py | 34 +++++++++++++++++++
src/_zkapauthorizer/tests/test_base64.py | 4 +++
.../tests/test_client_resource.py | 4 +++
src/_zkapauthorizer/tests/test_controller.py | 4 +++
src/_zkapauthorizer/tests/test_matchers.py | 4 +++
src/_zkapauthorizer/tests/test_model.py | 4 +++
src/_zkapauthorizer/tests/test_plugin.py | 4 +++
.../tests/test_storage_protocol.py | 32 ++++-------------
src/_zkapauthorizer/tests/test_strategies.py | 4 +++
9 files changed, 69 insertions(+), 25 deletions(-)
create mode 100644 src/_zkapauthorizer/tests/fixtures.py
diff --git a/src/_zkapauthorizer/tests/fixtures.py b/src/_zkapauthorizer/tests/fixtures.py
new file mode 100644
index 0000000..20b0592
--- /dev/null
+++ b/src/_zkapauthorizer/tests/fixtures.py
@@ -0,0 +1,34 @@
+from __future__ import (
+ absolute_import,
+)
+
+from fixtures import (
+ Fixture,
+ TempDir,
+)
+
+from twisted.python.filepath import (
+ FilePath,
+)
+
+from allmydata.storage.server import (
+ StorageServer,
+)
+
+class AnonymousStorageServer(Fixture):
+ """
+ Supply an instance of allmydata.storage.server.StorageServer which
+ implements anonymous access to Tahoe-LAFS storage server functionality.
+
+ :ivar FilePath tempdir: The path to the server's storage on the
+ filesystem.
+
+ :ivar allmydata.storage.server.StorageServer storage_server: The storage
+ server.
+ """
+ def _setUp(self):
+ self.tempdir = FilePath(self.useFixture(TempDir()).join(b"storage"))
+ self.storage_server = StorageServer(
+ self.tempdir.asBytesMode().path,
+ b"x" * 20,
+ )
diff --git a/src/_zkapauthorizer/tests/test_base64.py b/src/_zkapauthorizer/tests/test_base64.py
index 05501c6..4a988b6 100644
--- a/src/_zkapauthorizer/tests/test_base64.py
+++ b/src/_zkapauthorizer/tests/test_base64.py
@@ -16,6 +16,10 @@
Tests for ``_zkapauthorizer._base64``.
"""
+from __future__ import (
+ absolute_import,
+)
+
from base64 import (
urlsafe_b64encode,
)
diff --git a/src/_zkapauthorizer/tests/test_client_resource.py b/src/_zkapauthorizer/tests/test_client_resource.py
index 77b5bb3..20047d3 100644
--- a/src/_zkapauthorizer/tests/test_client_resource.py
+++ b/src/_zkapauthorizer/tests/test_client_resource.py
@@ -17,6 +17,10 @@ Tests for the web resource provided by the client part of the Tahoe-LAFS
plugin.
"""
+from __future__ import (
+ absolute_import,
+)
+
import attr
from .._base64 import (
diff --git a/src/_zkapauthorizer/tests/test_controller.py b/src/_zkapauthorizer/tests/test_controller.py
index 4e3f264..6001b29 100644
--- a/src/_zkapauthorizer/tests/test_controller.py
+++ b/src/_zkapauthorizer/tests/test_controller.py
@@ -16,6 +16,10 @@
Tests for ``_zkapauthorizer.controller``.
"""
+from __future__ import (
+ absolute_import,
+)
+
from json import (
loads,
dumps,
diff --git a/src/_zkapauthorizer/tests/test_matchers.py b/src/_zkapauthorizer/tests/test_matchers.py
index 7ff71c0..868a1e9 100644
--- a/src/_zkapauthorizer/tests/test_matchers.py
+++ b/src/_zkapauthorizer/tests/test_matchers.py
@@ -16,6 +16,10 @@
Tests for ``_zkapauthorizer.tests.matchers``.
"""
+from __future__ import (
+ absolute_import,
+)
+
from zope.interface import (
Interface,
implementer,
diff --git a/src/_zkapauthorizer/tests/test_model.py b/src/_zkapauthorizer/tests/test_model.py
index f614c1c..14fd2f0 100644
--- a/src/_zkapauthorizer/tests/test_model.py
+++ b/src/_zkapauthorizer/tests/test_model.py
@@ -17,6 +17,10 @@
Tests for ``_zkapauthorizer.model``.
"""
+from __future__ import (
+ absolute_import,
+)
+
from os import (
mkdir,
)
diff --git a/src/_zkapauthorizer/tests/test_plugin.py b/src/_zkapauthorizer/tests/test_plugin.py
index d497c72..b8acfc5 100644
--- a/src/_zkapauthorizer/tests/test_plugin.py
+++ b/src/_zkapauthorizer/tests/test_plugin.py
@@ -16,6 +16,10 @@
Tests for the Tahoe-LAFS plugin.
"""
+from __future__ import (
+ absolute_import,
+)
+
from io import (
BytesIO,
)
diff --git a/src/_zkapauthorizer/tests/test_storage_protocol.py b/src/_zkapauthorizer/tests/test_storage_protocol.py
index 0bd6cb8..0b3743d 100644
--- a/src/_zkapauthorizer/tests/test_storage_protocol.py
+++ b/src/_zkapauthorizer/tests/test_storage_protocol.py
@@ -16,11 +16,13 @@
Tests for communication between the client and server components.
"""
+from __future__ import (
+ absolute_import,
+)
+
import attr
from fixtures import (
- Fixture,
- TempDir,
MonkeyPatch,
)
from testtools import (
@@ -62,10 +64,6 @@ from foolscap.referenceable import (
LocalReferenceable,
)
-from allmydata.storage.server import (
- StorageServer,
-)
-
from .strategies import (
storage_indexes,
lease_renew_secrets,
@@ -81,6 +79,9 @@ from .strategies import (
from .matchers import (
matches_version_dictionary,
)
+from .fixtures import (
+ AnonymousStorageServer,
+)
from ..api import (
ZKAPAuthorizerStorageServer,
ZKAPAuthorizerStorageClient,
@@ -92,25 +93,6 @@ from ..model import (
Pass,
)
-class AnonymousStorageServer(Fixture):
- """
- Supply an instance of allmydata.storage.server.StorageServer which
- implements anonymous access to Tahoe-LAFS storage server functionality.
-
- :ivar FilePath tempdir: The path to the server's storage on the
- filesystem.
-
- :ivar allmydata.storage.server.StorageServer storage_server: The storage
- server.
- """
- def _setUp(self):
- self.tempdir = FilePath(self.useFixture(TempDir()).join(b"storage"))
- self.storage_server = StorageServer(
- self.tempdir.asBytesMode().path,
- b"x" * 20,
- )
-
-
@attr.s
class LocalRemote(object):
"""
diff --git a/src/_zkapauthorizer/tests/test_strategies.py b/src/_zkapauthorizer/tests/test_strategies.py
index 22f5aac..6a0307e 100644
--- a/src/_zkapauthorizer/tests/test_strategies.py
+++ b/src/_zkapauthorizer/tests/test_strategies.py
@@ -16,6 +16,10 @@
Tests for our custom Hypothesis strategies.
"""
+from __future__ import (
+ absolute_import,
+)
+
from testtools import (
TestCase,
)
--
GitLab