From 7a5a99a1a827d29261177a986bbc51a9c0d147c9 Mon Sep 17 00:00:00 2001
From: Brian Warner <warner@lothar.com>
Date: Wed, 20 Apr 2016 18:54:10 -0700
Subject: [PATCH] unsplit tests step 3: modify files

---
 setup.py                                  | 4 +++-
 src/wormhole/test/common.py               | 2 +-
 src/wormhole/test/test_blocking.py        | 6 +++---
 src/wormhole/test/test_interop.py         | 2 +-
 src/wormhole/test/test_scripts.py         | 6 +++---
 src/wormhole/test/test_server.py          | 2 +-
 src/wormhole/test/test_transit_twisted.py | 2 +-
 tox.ini                                   | 4 ++--
 8 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/setup.py b/setup.py
index 73dd899..7e4aca4 100644
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,9 @@ setup(name="magic-wormhole",
                 "wormhole.blocking",
                 "txwormhole",
                 "wormhole_cli",
-                "wormhole_server"],
+                "wormhole_server",
+                "wormhole.test",
+                ],
       package_data={"wormhole_server": ["db-schemas/*.sql"]},
       entry_points={"console_scripts":
                     ["wormhole = wormhole_cli.runner:entry",
diff --git a/src/wormhole/test/common.py b/src/wormhole/test/common.py
index 96f1548..5436fdb 100644
--- a/src/wormhole/test/common.py
+++ b/src/wormhole/test/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 wormhole import __version__
+from .. import __version__
 
 class ServerBase:
     def setUp(self):
diff --git a/src/wormhole/test/test_blocking.py b/src/wormhole/test/test_blocking.py
index cb35714..7ba8222 100644
--- a/src/wormhole/test/test_blocking.py
+++ b/src/wormhole/test/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 wormhole.blocking.transcribe import (Wormhole, UsageError, ChannelManager,
-                                          WrongPasswordError)
-from wormhole.blocking.eventsource import EventSourceFollower
+from ..blocking.transcribe import (Wormhole, UsageError, ChannelManager,
+                                   WrongPasswordError)
+from ..blocking.eventsource import EventSourceFollower
 from .common import ServerBase
 
 APPID = u"appid"
diff --git a/src/wormhole/test/test_interop.py b/src/wormhole/test/test_interop.py
index ec655af..f216a6e 100644
--- a/src/wormhole/test/test_interop.py
+++ b/src/wormhole/test/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 wormhole.blocking.transcribe import Wormhole as blocking_Wormhole
+from ..blocking.transcribe import Wormhole as blocking_Wormhole
 from .common import ServerBase
 
 # make sure the two implementations (Twisted-style and blocking-style) can
diff --git a/src/wormhole/test/test_scripts.py b/src/wormhole/test/test_scripts.py
index d05f148..ea4234e 100644
--- a/src/wormhole/test/test_scripts.py
+++ b/src/wormhole/test/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 wormhole import __version__
+from .. 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 wormhole.errors import TransferError
-from wormhole.timing import DebugTiming
+from ..errors import TransferError
+from ..timing import DebugTiming
 
 class Phase1Data(unittest.TestCase):
     def setUp(self):
diff --git a/src/wormhole/test/test_server.py b/src/wormhole/test/test_server.py
index 76e4128..1d7da4a 100644
--- a/src/wormhole/test/test_server.py
+++ b/src/wormhole/test/test_server.py
@@ -10,7 +10,7 @@ from twisted.internet.threads import deferToThread
 from twisted.internet.endpoints import clientFromString, connectProtocol
 from twisted.web.client import getPage, Agent, readBody
 from autobahn.twisted import websocket
-from wormhole import __version__
+from .. import __version__
 from .common import ServerBase
 from wormhole_server import rendezvous, transit_server
 from txwormhole.eventsource import EventSource
diff --git a/src/wormhole/test/test_transit_twisted.py b/src/wormhole/test/test_transit_twisted.py
index fd42291..2a4e50d 100644
--- a/src/wormhole/test/test_transit_twisted.py
+++ b/src/wormhole/test/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 wormhole.errors import UsageError
+from ..errors import UsageError
 from nacl.secret import SecretBox
 from nacl.exceptions import CryptoError
 
diff --git a/tox.ini b/tox.ini
index f84db2d..80751e4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -21,9 +21,9 @@ deps =
     pyflakes
     {env:EXTRA_DEPENDENCY:}
 commands =
-    pyflakes setup.py src tests
+    pyflakes setup.py src
     wormhole --version
-    trial {posargs:tests}
+    trial {posargs:wormhole.test}
 
 # 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