From a746ca726a34a8058e5ec52dcd55835e6c6d5d1b Mon Sep 17 00:00:00 2001
From: Brian Warner <warner@lothar.com>
Date: Sun, 25 Dec 2016 15:40:36 -0500
Subject: [PATCH] test_server: factor out common utils

---
 src/wormhole/test/test_server.py | 73 ++++++++++++++------------------
 1 file changed, 31 insertions(+), 42 deletions(-)

diff --git a/src/wormhole/test/test_server.py b/src/wormhole/test/test_server.py
index e0654d8..383ec73 100644
--- a/src/wormhole/test/test_server.py
+++ b/src/wormhole/test/test_server.py
@@ -12,7 +12,36 @@ from ..server import server, rendezvous
 from ..server.rendezvous import Usage, SidedMessage
 from ..server.database import get_db
 
-class Server(ServerBase, unittest.TestCase):
+class _Util:
+    def _nameplate(self, app, name):
+        np_row = app._db.execute("SELECT * FROM `nameplates`"
+                                 " WHERE `app_id`='appid' AND `name`=?",
+                                 (name,)).fetchone()
+        if not np_row:
+            return None, None
+        npid = np_row["id"]
+        side_rows = app._db.execute("SELECT * FROM `nameplate_sides`"
+                                    " WHERE `nameplates_id`=?",
+                                    (npid,)).fetchall()
+        return np_row, side_rows
+
+    def _mailbox(self, app, mailbox_id):
+        mb_row = app._db.execute("SELECT * FROM `mailboxes`"
+                                 " WHERE `app_id`='appid' AND `id`=?",
+                                 (mailbox_id,)).fetchone()
+        if not mb_row:
+            return None, None
+        side_rows = app._db.execute("SELECT * FROM `mailbox_sides`"
+                                    " WHERE `mailbox_id`=?",
+                                    (mailbox_id,)).fetchall()
+        return mb_row, side_rows
+
+    def _messages(self, app):
+        c = app._db.execute("SELECT * FROM `messages`"
+                            " WHERE `app_id`='appid' AND `mailbox_id`='mid'")
+        return c.fetchall()
+
+class Server(_Util, ServerBase, unittest.TestCase):
     def test_apps(self):
         app1 = self._rendezvous.get_app("appid1")
         self.assertIdentical(app1, self._rendezvous.get_app("appid1"))
@@ -45,18 +74,6 @@ class Server(ServerBase, unittest.TestCase):
         biggest = max(nids)
         self.assert_(1000 <= biggest < 1000000, biggest)
 
-    def _nameplate(self, app, name):
-        np_row = app._db.execute("SELECT * FROM `nameplates`"
-                                 " WHERE `app_id`='appid' AND `name`=?",
-                                 (name,)).fetchone()
-        if not np_row:
-            return None, None
-        npid = np_row["id"]
-        side_rows = app._db.execute("SELECT * FROM `nameplate_sides`"
-                                    " WHERE `nameplates_id`=?",
-                                    (npid,)).fetchall()
-        return np_row, side_rows
-
     def test_nameplate(self):
         app = self._rendezvous.get_app("appid")
         name = app.allocate_nameplate("side1", 0)
@@ -148,17 +165,6 @@ class Server(ServerBase, unittest.TestCase):
         self.assertEqual(usage["result"], "crowded")
 
 
-    def _mailbox(self, app, mailbox_id):
-        mb_row = app._db.execute("SELECT * FROM `mailboxes`"
-                                 " WHERE `app_id`='appid' AND `id`=?",
-                                 (mailbox_id,)).fetchone()
-        if not mb_row:
-            return None, None
-        side_rows = app._db.execute("SELECT * FROM `mailbox_sides`"
-                                    " WHERE `mailbox_id`=?",
-                                    (mailbox_id,)).fetchall()
-        return mb_row, side_rows
-
     def test_mailbox(self):
         app = self._rendezvous.get_app("appid")
         mailbox_id = "mid"
@@ -229,11 +235,6 @@ class Server(ServerBase, unittest.TestCase):
         self.assertEqual(usage["total_time"], 7)
         self.assertEqual(usage["result"], "crowded")
 
-    def _messages(self, app):
-        c = app._db.execute("SELECT * FROM `messages`"
-                            " WHERE `app_id`='appid' AND `mailbox_id`='mid'")
-        return c.fetchall()
-
     def test_messages(self):
         app = self._rendezvous.get_app("appid")
         mailbox_id = "mid"
@@ -599,7 +600,7 @@ class WSClientSync(unittest.TestCase):
 
 
 
-class WebSocketAPI(ServerBase, unittest.TestCase):
+class WebSocketAPI(_Util, ServerBase, unittest.TestCase):
     def setUp(self):
         self._clients = []
         return ServerBase.setUp(self)
@@ -699,18 +700,6 @@ class WebSocketAPI(ServerBase, unittest.TestCase):
             nids.add(n["id"])
         self.assertEqual(nids, set([nameplate_id1, "np2"]))
 
-    def _nameplate(self, app, name):
-        np_row = app._db.execute("SELECT * FROM `nameplates`"
-                                 " WHERE `app_id`='appid' AND `name`=?",
-                                 (name,)).fetchone()
-        if not np_row:
-            return None, None
-        npid = np_row["id"]
-        side_rows = app._db.execute("SELECT * FROM `nameplate_sides`"
-                                    " WHERE `nameplates_id`=?",
-                                    (npid,)).fetchall()
-        return np_row, side_rows
-
     @inlineCallbacks
     def test_allocate(self):
         c1 = yield self.make_client()