net/tools/testserver/testserver.py - Issue 11363194: Enable 307 net unit tests on Android.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 11363194: Enable 307 net unit tests on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 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:

Index: net/tools/testserver/testserver.py

diff --git a/net/tools/testserver/testserver.py b/net/tools/testserver/testserver.py

index ba74b69130c6f765f798dba924b5b5962a0a1145..0ab49c07ff056732ab6bb16206397d11ae8d93f4 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

« no previous file with comments | « build/android/gtest_filter/net_unittests_disabled ('k') | no next file » | no next file with comments »