commit fa3827ac4130595ebb93b40a9e5cb0abc6715e0c
author Gwendal Grignou <gwendal@chromium.org> Fri Feb 14 13:23:29 2014 -0800
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Wed Mar 05 01:47:29 2014 +0000
tree 5f4c4d4084ea436693d0a295dabb82f831979a6c
parent 7feb1d5868920a4b8083ed2441cd8a74dc92b0aa

Use mpstat already installed

No need to install sysstat, it is already present in chromeos-dev.

BUG=chromium:340710
CQ-DEPEND=CL:186656
TEST=Ran network_netperf2 on Link.

Change-Id: I7a9ed09ce4608409a0f45838ee627090462fa1ef
Reviewed-on: https://chromium-review.googlesource.com/186670
Reviewed-by: Gwendal Grignou <gwendal@chromium.org>
Commit-Queue: Gwendal Grignou <gwendal@chromium.org>
Tested-by: Gwendal Grignou <gwendal@chromium.org>

client/tests/netperf2/netperf2.py

diff --git a/client/tests/netperf2/netperf2.py b/client/tests/netperf2/netperf2.py
index 87507a5..920a524 100644
--- a/client/tests/netperf2/netperf2.py
+++ b/client/tests/netperf2/netperf2.py
@@ -1,4 +1,4 @@
-import os, time, re, logging
+import os, time, 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
@@ -20,8 +20,6 @@
         utils.configure()
         utils.make()
 
-        self.job.setup_dep(['sysstat'])
-
 
     def initialize(self):
         self.server_prog = '%s&' % os.path.join(self.srcdir, 'src/netserver')
@@ -34,10 +32,6 @@
         self.network = net_utils.network()
         self.network_utils = net_utils.network_utils()
 
-        dep = 'sysstat'
-        dep_dir = os.path.join(self.autodir, 'deps', dep)
-        self.job.install_pkg(dep, 'dep', dep_dir)
-
 
     def run_once(self, server_ip, client_ip, role, test = 'TCP_STREAM',
                  test_time = 15, stream_list = [1], test_specific_args = '',
@@ -147,11 +141,6 @@
                test_specific_args, cpu_affinity):
         args = '-H %s -t %s -l %d' % (server_ip, test, test_time)
 
-        if os.path.exists('/usr/bin/mpstat'):
-            mpstat = '/usr/bin/mpstat'
-        else:
-            mpstat = os.path.join(self.autodir + '/deps/sysstat/src/mpstat')
-
         if self.wait_time:
             args += ' -s %d ' % self.wait_time
 
@@ -171,8 +160,8 @@
             # 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))
+            cmds.append('sleep %d && %s -P ALL %s 5' %
+                        (self.wait_time, 'mpstat', interval))
 
             # Add the netperf commands
             for i in xrange(num_streams):