Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(86)

Unified Diff: net/tools/testserver/testserver.py

Issue 74253002: Stop using third_party\python_26 for many tests. (Closed) Base URL: https://chromium.googlesource.com/a/chromium/src.git@master
Patch Set: Do not use system version at all Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/tools/testserver/testserver.py
diff --git a/net/tools/testserver/testserver.py b/net/tools/testserver/testserver.py
index e0317e8868524bece9b141f20b74a02c3faae673..6e0dfb8dc78e70b3e550b88ecee1cd759a913623 100755
--- a/net/tools/testserver/testserver.py
+++ b/net/tools/testserver/testserver.py
@@ -35,15 +35,22 @@ import urllib
import urlparse
import zlib
+BASE_DIR = os.path.dirname(os.path.abspath(__file__))
+ROOT_DIR = os.path.dirname(os.path.dirname(os.path.dirname(BASE_DIR)))
+
+
+# Insert at the beginning of the path, we want these to be used
+# unconditionally.
+sys.path.insert(0, os.path.join(ROOT_DIR, 'third_party', 'tlslite'))
+sys.path.insert(0, os.path.join(ROOT_DIR, 'third_party', 'pyftpdlib', 'src'))
+sys.path.insert(0, os.path.join(ROOT_DIR, 'third_party', 'pywebsocket', 'src'))
+
import echo_message
import pyftpdlib.ftpserver
import testserver_base
import tlslite
import tlslite.api
-BASE_DIR = os.path.dirname(os.path.abspath(__file__))
-sys.path.insert(
- 0, os.path.join(BASE_DIR, '..', '..', '..', 'third_party/pywebsocket/src'))
from mod_pywebsocket.standalone import WebSocketServer
SERVER_HTTP = 0
« net/test/python_utils.cc ('K') | « net/test/spawned_test_server/local_test_server_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698