move tests step 2: fix imports, setup.py, tox.ini

setup.py

@@ -17,7 +17,6 @@ setup(name="magic-wormhole",
                 "wormhole.blocking",
                 "txwormhole",
                 "wormhole_cli",
-                "wormhole.test",
                 "wormhole_server"],
       package_data={"wormhole_server": ["db-schemas/*.sql"]},
       entry_points={"console_scripts":

tests/common.py

@@ -3,7 +3,7 @@ from twisted.internet import reactor, defer
 from twisted.python import log
 from txwormhole.transit import allocate_tcp_port
 from wormhole_server.server import RelayServer
-from .. import __version__
+from wormhole import __version__
 
 class ServerBase:
     def setUp(self):

tests/test_blocking.py

@@ -3,9 +3,9 @@ import json
 from twisted.trial import unittest
 from twisted.internet.defer import gatherResults, succeed
 from twisted.internet.threads import deferToThread
-from ..blocking.transcribe import (Wormhole, UsageError, ChannelManager,
+from wormhole.blocking.transcribe import (Wormhole, UsageError, ChannelManager,
                                           WrongPasswordError)
-from ..blocking.eventsource import EventSourceFollower
+from wormhole.blocking.eventsource import EventSourceFollower
 from .common import ServerBase
 
 APPID = u"appid"

tests/test_interop.py

@@ -3,7 +3,7 @@ from twisted.trial import unittest
 from twisted.internet.defer import gatherResults
 from twisted.internet.threads import deferToThread
 from txwormhole.transcribe import Wormhole as twisted_Wormhole
-from ..blocking.transcribe import Wormhole as blocking_Wormhole
+from wormhole.blocking.transcribe import Wormhole as blocking_Wormhole
 from .common import ServerBase
 
 # make sure the two implementations (Twisted-style and blocking-style) can

tests/test_scripts.py

@@ -4,12 +4,12 @@ from twisted.trial import unittest
 from twisted.python import procutils, log
 from twisted.internet.utils import getProcessOutputAndValue
 from twisted.internet.defer import inlineCallbacks
-from .. import __version__
+from wormhole import __version__
 from .common import ServerBase
 from wormhole_cli import runner, cmd_send, cmd_receive
 from wormhole_cli.cmd_send import build_phase1_data
-from ..errors import TransferError
+from wormhole.errors import TransferError
-from ..timing import DebugTiming
+from wormhole.timing import DebugTiming
 
 class Phase1Data(unittest.TestCase):
     def test_text(self):

tests/test_server.py

@@ -8,7 +8,7 @@ from twisted.internet import protocol, reactor, defer
 from twisted.internet.threads import deferToThread
 from twisted.internet.endpoints import clientFromString, connectProtocol
 from twisted.web.client import getPage, Agent, readBody
-from .. import __version__
+from wormhole import __version__
 from .common import ServerBase
 from wormhole_server import relay_server, transit_server
 from txwormhole.eventsource import EventSource

tests/test_transit_twisted.py

@@ -7,7 +7,7 @@ from twisted.internet.defer import gatherResults, inlineCallbacks
 from twisted.python import log, failure
 from twisted.test import proto_helpers
 from txwormhole import transit
-from ..errors import UsageError
+from wormhole.errors import UsageError
 from nacl.secret import SecretBox
 from nacl.exceptions import CryptoError
 

tox.ini

@@ -21,9 +21,9 @@ deps =
     pyflakes
     {env:EXTRA_DEPENDENCY:}
 commands =
-    pyflakes setup.py src
+    pyflakes setup.py src tests
     wormhole --version
-    trial {posargs:wormhole}
+    trial {posargs:tests}
 
 # on windows, trial is installed as venv/bin/trial.py, not .exe, but (at
 # least appveyor) adds .PY to $PATHEXT. So "trial wormhole" might work on