Merge remote branch 'autotest-upstream/master' into try-box1

client/tests/netperf2/netperf2.py

 import os, time, re, logging
 from autotest_lib.client.bin import test, utils
 from autotest_lib.client.bin.net import net_utils
 from autotest_lib.client.common_lib import error
 
 MPSTAT_IX = 0
 NETPERF_IX = 1
 
 class netperf2(test.test):
     version = 4
@@ skipping 155 matching lines @@
             cmd = 'taskset %s %s' % (cpu_affinity, cmd)
 
         try:
             cmds = []
 
             # Get 5 mpstat samples. Since tests with large number of streams
             # take a long time to start up all the streams, we'll toss out the
             # first and last sample when recording results
             interval = max(1, test_time / 5)
             cmds.append('sleep %d && %s -P ALL %s 5' % (self.wait_time, mpstat,
-                                                            interval))
+                                                        interval))
 
             # Add the netperf commands
             for i in xrange(num_streams):
                 cmds.append(cmd)
                 if self.bidi and test == 'TCP_STREAM':
                     cmds.append(cmd.replace('TCP_STREAM', 'TCP_MAERTS'))
 
             t0 = time.time()
             # Launch all commands in parallel
             out = utils.run_parallel(cmds, timeout=test_time + 500,
@@ skipping 154 matching lines @@
         end_time = curr_time + timeout
         while curr_time < end_time:
             if not os.system('ping -c 1 ' + ip):
                 # Ping succeeded
                 return
             # Ping failed. Lets sleep a bit and try again.
             time.sleep(5)
             curr_time = time.time()
 
         return