summaryrefslogtreecommitdiff
path: root/indra/llcorehttp/tests/test_llcorehttp_peer.py
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2016-12-05 17:01:38 -0500
committerNat Goodspeed <nat@lindenlab.com>2016-12-05 17:01:38 -0500
commit05d58c91ef55fd90ea2f3e0f1a1199ac5e690b30 (patch)
tree70ae80b97c738ceee3b4ba530454e97a8698b6cb /indra/llcorehttp/tests/test_llcorehttp_peer.py
parent68413474c4479eee9bdbeb34ea131475ba1d646e (diff)
parent4ca084f7a06acc4ef861c1f4df2f857f8836b85e (diff)
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
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):