commit bdaab795cffa33f9a37995bb283047cb03699272
author Kenneth Waters <kwaters@chromium.org> Fri Jan 07 13:18:10 2011 -0800
committer Kenneth Waters <kwaters@chromium.org> Fri Jan 07 13:18:10 2011 -0800
tree 5e9b4a54155c2360f3e2015d7922c609c0addc0e
parent 3b00323790532e63843c77877a4d185563c7723e

Revert "Merge remote branch 'cros/upstream' into autotest-rebase"

This reverts commit 7edb30498d75a29a3287fe07070f2b51a116c5d4.

TEST=Built for tegra2_seaboard
BUG=10756

Review URL: http://codereview.chromium.org/6124004

Change-Id: Ifcd1a2279f5a62b99552a8f961c1430889a3a928

server/tests/netperf2/netperf2.py

diff --git a/server/tests/netperf2/netperf2.py b/server/tests/netperf2/netperf2.py
index 108dab8..604e4c8 100644
--- a/server/tests/netperf2/netperf2.py
+++ b/server/tests/netperf2/netperf2.py
@@ -33,7 +33,7 @@
                             "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)