summaryrefslogtreecommitdiff
path: root/indra/llcorehttp/tests/test_llcorehttp_peer.py
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2016-11-17 17:46:50 -0500
committerNat Goodspeed <nat@lindenlab.com>2016-11-17 17:46:50 -0500
commit73a7b14013059eee3b010ae271515d7492654f9b (patch)
tree6c2a89bda8eb9b3f0d8548e32224d297568b12e2 /indra/llcorehttp/tests/test_llcorehttp_peer.py
parentb1185eca82a1c0fff1a885fd5dfea09e5b9c0b3a (diff)
DRTVWR-418: Fold redundant testrunner.py modules together again.
llcorehttp/tests had a clone of llmessage/tests/testrunner.py that was almost identical save for recognizing an extra optional parameter. Migrate those few lines into llmessage/tests/testrunner.py; eliminate the copy in llcorehttp; help test_llcorehttp_peer.py find the testrunner.py in llmessage/tests.
Diffstat (limited to 'indra/llcorehttp/tests/test_llcorehttp_peer.py')
-rwxr-xr-xindra/llcorehttp/tests/test_llcorehttp_peer.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llcorehttp/tests/test_llcorehttp_peer.py b/indra/llcorehttp/tests/test_llcorehttp_peer.py
index 6c5f37d407..3ec9cd7d4c 100755
--- a/indra/llcorehttp/tests/test_llcorehttp_peer.py
+++ b/indra/llcorehttp/tests/test_llcorehttp_peer.py
@@ -44,6 +44,11 @@ from SocketServer import ThreadingMixIn
from llbase.fastest_elementtree import parse as xml_parse
from llbase import llsd
+
+# we're in llcorehttp/tests ; testrunner.py is found in llmessage/tests
+sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, os.pardir,
+ "llmessage", "tests"))
+
from testrunner import freeport, run, debug, VERBOSE
class TestHTTPRequestHandler(BaseHTTPRequestHandler):