open.source/magic-wormhole
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test_server: factor out common utils

Browse Source
This commit is contained in:
Brian Warner 2016-12-25 15:40:36 -05:00
parent 3ad29379b5
commit a746ca726a
1 changed files with 31 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/wormhole/test/test_server.py
View File

@ -12,7 +12,36 @@ from ..server import server, rendezvous
from ..server.rendezvous import Usage, SidedMessage from ..server.rendezvous import Usage, SidedMessage
from ..server.database import get_db 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): def test_apps(self):
app1 = self._rendezvous.get_app("appid1") app1 = self._rendezvous.get_app("appid1")
self.assertIdentical(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) biggest = max(nids)
self.assert_(1000 <= biggest < 1000000, biggest) 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): def test_nameplate(self):
app = self._rendezvous.get_app("appid") app = self._rendezvous.get_app("appid")
name = app.allocate_nameplate("side1", 0) name = app.allocate_nameplate("side1", 0)
@ -148,17 +165,6 @@ class Server(ServerBase, unittest.TestCase):
self.assertEqual(usage["result"], "crowded") 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): def test_mailbox(self):
app = self._rendezvous.get_app("appid") app = self._rendezvous.get_app("appid")
mailbox_id = "mid" mailbox_id = "mid"
@ -229,11 +235,6 @@ class Server(ServerBase, unittest.TestCase):
self.assertEqual(usage["total_time"], 7) self.assertEqual(usage["total_time"], 7)
self.assertEqual(usage["result"], "crowded") 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): def test_messages(self):
app = self._rendezvous.get_app("appid") app = self._rendezvous.get_app("appid")
mailbox_id = "mid" 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): def setUp(self):
self._clients = [] self._clients = []
return ServerBase.setUp(self) return ServerBase.setUp(self)
@ -699,18 +700,6 @@ class WebSocketAPI(ServerBase, unittest.TestCase):
nids.add(n["id"]) nids.add(n["id"])
self.assertEqual(nids, set([nameplate_id1, "np2"])) 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 @inlineCallbacks
def test_allocate(self): def test_allocate(self):
c1 = yield self.make_client() c1 = yield self.make_client()