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

split wormhole_server step 3: fix tests

Browse Source
This commit is contained in:
Brian Warner 2016-04-15 16:58:24 -07:00
parent 190ce2c027
commit 87266f1292
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup.py
View File

@ -17,7 +17,7 @@ setup(name="magic-wormhole",
"wormhole.blocking", "wormhole.twisted", "wormhole.blocking", "wormhole.twisted",
"wormhole.scripts", "wormhole.test", "wormhole.util", "wormhole.scripts", "wormhole.test", "wormhole.util",
"wormhole_server"], "wormhole_server"],
package_data={"wormhole": ["db-schemas/*.sql"]}, package_data={"wormhole_server": ["db-schemas/*.sql"]},
entry_points={"console_scripts": entry_points={"console_scripts":
["wormhole = wormhole.scripts.runner:entry", ["wormhole = wormhole.scripts.runner:entry",
"wormhole-server = wormhole_server.runner:entry", "wormhole-server = wormhole_server.runner:entry",

2
src/wormhole/test/common.py
View File

@ -2,7 +2,7 @@ from twisted.application import service
from twisted.internet import reactor, defer from twisted.internet import reactor, defer
from twisted.python import log from twisted.python import log
from ..twisted.transit import allocate_tcp_port from ..twisted.transit import allocate_tcp_port
from ..servers.server import RelayServer from wormhole_server.server import RelayServer
from .. import __version__ from .. import __version__
class ServerBase: class ServerBase:

2
src/wormhole/test/test_load.py
View File

@ -4,3 +4,5 @@ class Import(unittest.TestCase):
def test_import(self): def test_import(self):
import wormhole import wormhole
self.assertTrue(len(wormhole.__version__)) self.assertTrue(len(wormhole.__version__))
import wormhole_server
self.assertTrue(len(wormhole_server.__version__))

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

@ -10,7 +10,7 @@ from twisted.internet.endpoints import clientFromString, connectProtocol
from twisted.web.client import getPage, Agent, readBody from twisted.web.client import getPage, Agent, readBody
from .. import __version__ from .. import __version__
from .common import ServerBase from .common import ServerBase
from ..servers import relay_server, transit_server from wormhole_server import relay_server, transit_server
from ..twisted.eventsource_twisted import EventSource from ..twisted.eventsource_twisted import EventSource
class Reachable(ServerBase, unittest.TestCase): class Reachable(ServerBase, unittest.TestCase):