diff options
| author | pliard@chromium.org <pliard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-14 11:38:55 +0000 |
|---|---|---|
| committer | pliard@chromium.org <pliard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-14 11:38:55 +0000 |
| commit | 840c2caee4ae7f9a892b4b647561d513771a7906 (patch) | |
| tree | 7f6f015442ba761ea747200078118daf5e15e784 /net | |
| parent | 7873db186b9189de8d44a7520d485c228c09f03b (diff) | |
| download | chromium_src-840c2caee4ae7f9a892b4b647561d513771a7906.zip chromium_src-840c2caee4ae7f9a892b4b647561d513771a7906.tar.gz chromium_src-840c2caee4ae7f9a892b4b647561d513771a7906.tar.bz2 | |
Enable 307 net unit tests on Android.
This is possible since r167167 landed.
BUG=146979
Review URL: https://chromiumcodereview.appspot.com/11363194
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167653 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rwxr-xr-x | net/tools/testserver/testserver.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/tools/testserver/testserver.py b/net/tools/testserver/testserver.py index ba74b691..0ab49c0 100755 --- a/net/tools/testserver/testserver.py +++ b/net/tools/testserver/testserver.py @@ -37,13 +37,15 @@ import urlparse import zlib import echo_message -from mod_pywebsocket.standalone import WebSocketServer 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 SERVER_FTP = 1 |