server/tests/netperf2/netperf2.py - Issue 6246035: Merge remote branch 'cros/upstream' into master

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: server/tests/netperf2/netperf2.py

Issue 6246035: Merge remote branch 'cros/upstream' into master (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/autotest.git@master

Patch Set: patch Created 9 years, 11 months 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: server/tests/netperf2/netperf2.py

diff --git a/server/tests/netperf2/netperf2.py b/server/tests/netperf2/netperf2.py

index 604e4c8971717404f3dbc3654d60cba10871f9cd..108dab8b1bcd36fc5af3a0706be644e6492a5999 100644

--- a/server/tests/netperf2/netperf2.py

+++ b/server/tests/netperf2/netperf2.py

@@ -33,7 +33,7 @@ class netperf2(test.test):

"test_time=%d, stream_list=%s, tag='%s', ",

"iterations=%d)"])

- server_control_file = template % (server.ip, client.ip, 'server', test,

+ server_control_file = template % (server.ip, client.ip, 'server', test,

time, stream_list, test, cycles)

client_control_file = template % (server.ip, client.ip, 'client', test,

time, stream_list, test, cycles)