Index: net/tools/testserver/testserver.py |
diff --git a/net/tools/testserver/testserver.py b/net/tools/testserver/testserver.py |
index e0317e8868524bece9b141f20b74a02c3faae673..62745d6d21c734c71a12fd25d85b47fa4a474409 100755 |
--- a/net/tools/testserver/testserver.py |
+++ b/net/tools/testserver/testserver.py |
@@ -35,6 +35,16 @@ import urllib |
import urlparse |
import zlib |
+# Ignore deprecation warnings, they make our output more cluttered. |
+# TODO(maruel): warnings.filterwarnings("ignore", category=DeprecationWarning) |
+ |
+BASE_DIR = os.path.dirname(os.path.abspath(__file__)) |
+ROOT_DIR = os.path.dirname(os.path.dirname(os.path.dirname(BASE_DIR))) |
+ |
+# Append these paths at the the end of sys.path so the system lib will be used by default. |
Paweł Hajdan Jr.
2013/11/15 19:34:44
nit: 80 chars
|
+sys.path.append(os.path.join(ROOT_DIR, 'third_party', 'pyftpdlib', 'src')) |
+sys.path.append(os.path.join(ROOT_DIR, 'third_party', 'tlslite')) |
Paweł Hajdan Jr.
2013/11/15 19:34:44
The tests don't work with system tlslite. We depen
|
+ |
import echo_message |
import pyftpdlib.ftpserver |
import testserver_base |