From b75b48e68c2f906dfaf295cce4ad187906e49be9 Mon Sep 17 00:00:00 2001
From: Chad Whitacre <chad@zetaweb.com>
Date: Wed, 30 Sep 2020 23:05:52 -0400
Subject: [PATCH] Move FakeCanary to common_util

Couldn't bring myself to move it back to test_storage.
---
 src/allmydata/test/common_py3.py          | 28 -----------------------
 src/allmydata/test/common_util.py         | 28 +++++++++++++++++++++++
 src/allmydata/test/test_crawler.py        |  3 +--
 src/allmydata/test/test_storage.py        |  2 +-
 src/allmydata/test/test_storage_web.py    |  2 +-
 src/allmydata/test/web/test_introducer.py |  2 +-
 6 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/src/allmydata/test/common_py3.py b/src/allmydata/test/common_py3.py
index f0c4af6ba..f917cf8fb 100644
--- a/src/allmydata/test/common_py3.py
+++ b/src/allmydata/test/common_py3.py
@@ -87,31 +87,3 @@ def skip_if_cannot_represent_filename(u):
             u.encode(enc)
         except UnicodeEncodeError:
             raise unittest.SkipTest("A non-ASCII filename could not be encoded on this platform.")
-
-
-class Marker(object):
-    pass
-
-class FakeCanary(object):
-    """For use in storage tests.
-
-    Can be moved back to test_storage.py once enough Python 3 porting has been
-    done.
-    """
-    def __init__(self, ignore_disconnectors=False):
-        self.ignore = ignore_disconnectors
-        self.disconnectors = {}
-    def notifyOnDisconnect(self, f, *args, **kwargs):
-        if self.ignore:
-            return
-        m = Marker()
-        self.disconnectors[m] = (f, args, kwargs)
-        return m
-    def dontNotifyOnDisconnect(self, marker):
-        if self.ignore:
-            return
-        del self.disconnectors[marker]
-    def getRemoteTubID(self):
-        return None
-    def getPeer(self):
-        return "<fake>"
diff --git a/src/allmydata/test/common_util.py b/src/allmydata/test/common_util.py
index 6a0ee09dc..3b81be109 100644
--- a/src/allmydata/test/common_util.py
+++ b/src/allmydata/test/common_util.py
@@ -87,6 +87,34 @@ class StallMixin(object):
         return d
 
 
+class Marker(object):
+    pass
+
+class FakeCanary(object):
+    """For use in storage tests.
+
+    Can be moved back to test_storage.py once enough Python 3 porting has been
+    done.
+    """
+    def __init__(self, ignore_disconnectors=False):
+        self.ignore = ignore_disconnectors
+        self.disconnectors = {}
+    def notifyOnDisconnect(self, f, *args, **kwargs):
+        if self.ignore:
+            return
+        m = Marker()
+        self.disconnectors[m] = (f, args, kwargs)
+        return m
+    def dontNotifyOnDisconnect(self, marker):
+        if self.ignore:
+            return
+        del self.disconnectors[marker]
+    def getRemoteTubID(self):
+        return None
+    def getPeer(self):
+        return "<fake>"
+
+
 class ShouldFailMixin(object):
 
     def shouldFail(self, expected_failure, which, substring,
diff --git a/src/allmydata/test/test_crawler.py b/src/allmydata/test/test_crawler.py
index 1ed217251..a9be90c43 100644
--- a/src/allmydata/test/test_crawler.py
+++ b/src/allmydata/test/test_crawler.py
@@ -27,8 +27,7 @@ from allmydata.util import fileutil, hashutil, pollmixin
 from allmydata.storage.server import StorageServer, si_b2a
 from allmydata.storage.crawler import ShareCrawler, TimeSliceExceeded
 
-from allmydata.test.common_py3 import FakeCanary
-from allmydata.test.common_util import StallMixin
+from allmydata.test.common_util import StallMixin, FakeCanary
 
 class BucketEnumeratingCrawler(ShareCrawler):
     cpu_slice = 500 # make sure it can complete in a single slice
diff --git a/src/allmydata/test/test_storage.py b/src/allmydata/test/test_storage.py
index 83fcd6f28..01ae10280 100644
--- a/src/allmydata/test/test_storage.py
+++ b/src/allmydata/test/test_storage.py
@@ -52,7 +52,7 @@ from allmydata.storage_client import (
     _StorageServer,
 )
 from .common import LoggingServiceParent, ShouldFailMixin
-from .common_py3 import FakeCanary
+from .common_util import FakeCanary
 
 
 class UtilTests(unittest.TestCase):
diff --git a/src/allmydata/test/test_storage_web.py b/src/allmydata/test/test_storage_web.py
index 19f98851f..aa1f19936 100644
--- a/src/allmydata/test/test_storage_web.py
+++ b/src/allmydata/test/test_storage_web.py
@@ -50,7 +50,7 @@ from allmydata.web.storage import (
     StorageStatusElement,
     remove_prefix
 )
-from .common_py3 import FakeCanary
+from .common_util import FakeCanary
 
 def remove_tags(s):
     s = re.sub(br'<[^>]*>', b' ', s)
diff --git a/src/allmydata/test/web/test_introducer.py b/src/allmydata/test/web/test_introducer.py
index 5fdff47ad..bf6ef6a4b 100644
--- a/src/allmydata/test/web/test_introducer.py
+++ b/src/allmydata/test/web/test_introducer.py
@@ -33,7 +33,7 @@ from .common import (
 from ..common import (
     SameProcessStreamEndpointAssigner,
 )
-from ..common_py3 import (
+from ..common_util import (
     FakeCanary,
 )
 from ..common_web import (