Changeset 2e0e9f0c in trunk

Timestamp:

2019-08-03T10:39:31Z (6 years ago)

Author:

Jean-Paul Calderone <exarkun@…>

Branches:

master

Children:

3c3ebc3

Parents:

bbd1c70

git-author:

Jean-Paul Calderone <exarkun@…> (2019-06-28 18:26:50)

git-committer:

Jean-Paul Calderone <exarkun@…> (2019-08-03 10:39:31)

Message:

remove duplication of NativeStorageServer? instantiation

File:

• src/allmydata/storage_client.py (modified) (2 diffs)

src/allmydata/storage_client.py ¶

@@ -194 +194 @@
     # these two are used in unit tests
     def test_add_rref(self, serverid, rref, ann):
-        s = NativeStorageServer(serverid, ann.copy(), self._tub_maker, {})
+        s = self._make_storage_server(serverid, {"ann": ann.copy()})
         s._rref = rref
         s._is_connected = True
@@ -235 +235 @@
                     level=log.UNUSUAL)
             return
-        s = NativeStorageServer(server_id, ann, self._tub_maker, {})
-        s.on_status_changed(lambda _: self._got_connection())
+        s = self._make_storage_server(
+            server_id.decode("utf-8"),
+            {u"ann": ann},
+        )
         server_id = s.get_serverid()
         old = self.servers.get(server_id)