summaryrefslogtreecommitdiff
path: root/indra/llcorehttp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2016-11-16 08:39:41 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2016-11-16 08:39:41 -0500
commitd31596db6a6c5f7ef8c57bfaa42496db4a9b471e (patch)
treea107255826e044a4ef23ff6328e8468a39cb5995 /indra/llcorehttp
parentde487038fc034c470a21e9d6c5bf78e5085ae4a2 (diff)
parentecd93e56781498ef73ea2a3d5be0c449179b6a0a (diff)
merge
Diffstat (limited to 'indra/llcorehttp')
-rwxr-xr-xindra/llcorehttp/tests/test_llcorehttp_peer.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/llcorehttp/tests/test_llcorehttp_peer.py b/indra/llcorehttp/tests/test_llcorehttp_peer.py
index 04cde651c4..6c5f37d407 100755
--- a/indra/llcorehttp/tests/test_llcorehttp_peer.py
+++ b/indra/llcorehttp/tests/test_llcorehttp_peer.py
@@ -42,10 +42,8 @@ except ImportError:
from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler
from SocketServer import ThreadingMixIn
-mydir = os.path.dirname(__file__) # expected to be .../indra/llcorehttp/tests/
-sys.path.insert(0, os.path.join(mydir, os.pardir, os.pardir, "lib", "python"))
-from indra.util.fastest_elementtree import parse as xml_parse
-from indra.base import llsd
+from llbase.fastest_elementtree import parse as xml_parse
+from llbase import llsd
from testrunner import freeport, run, debug, VERBOSE
class TestHTTPRequestHandler(BaseHTTPRequestHandler):