commit 0804da999828c56053b80b1c763d854ab7923f90
author mbligh <mbligh@592f7852-d20e-0410-864c-8624ca9c26a4> Tue Jul 08 22:45:35 2008 +0000
committer mbligh <mbligh@592f7852-d20e-0410-864c-8624ca9c26a4> Tue Jul 08 22:45:35 2008 +0000
tree e11cc4ee50c54186905af9fce65700de667df2e6
parent 1e9e7cea6f19264f111a2a2af824b427b5f959ee

Found numerous problems thanks to pylint in sysbench.
I can't see how it ever ran.

Signed-off-by: Travis Miller <raphtee@google.com>



git-svn-id: http://test.kernel.org/svn/autotest/trunk@1785 592f7852-d20e-0410-864c-8624ca9c26a4

client/tests/sysbench/sysbench.py

diff --git a/client/tests/sysbench/sysbench.py b/client/tests/sysbench/sysbench.py
index aef3627..3845b38 100644
--- a/client/tests/sysbench/sysbench.py
+++ b/client/tests/sysbench/sysbench.py
@@ -1,6 +1,6 @@
-import time, re, pwd
+import os, time, re, pwd
 from autotest_lib.client.bin import test, autotest_utils
-from autotest_lib.client.common_lib import utils
+from autotest_lib.client.common_lib import utils, error
 
 
 class sysbench(test.test):
@@ -18,7 +18,9 @@
         mysql_dir = os.path.join(self.autodir, 'deps/mysql/mysql')
 
         # configure wants to get at pg_config, so add its path
-        utils.system('PATH=%s/bin:$PATH ./configure --with-mysql=%s --with-pgsql' % (pgsql_dir, mysql_dir))
+        utils.system(
+            'PATH=%s/bin:$PATH ./configure --with-mysql=%s --with-pgsql'
+            % (pgsql_dir, mysql_dir))
         utils.system('make -j %d' % autotest_utils.count_cpus())
 
 
@@ -27,8 +29,9 @@
                     read_only = 0, args = ''):
         plib = os.path.join(self.autodir, 'deps/pgsql/pgsql/lib')
         mlib = os.path.join(self.autodir, 'deps/mysql/mysql/lib/mysql')
-        ld_path = prepend_path(plib, environ('LD_LIBRARY_PATH'))
-        ld_path = prepend_path(mlib, ld_path)
+        ld_path = autotest_utils.prepend_path(plib,
+            autotest_utils.environ('LD_LIBRARY_PATH'))
+        ld_path = autotest_utils.prepend_path(mlib, ld_path)
         os.environ['LD_LIBRARY_PATH'] = ld_path
 
         # The databases don't want to run as root so run them as nobody
@@ -40,7 +43,7 @@
         try:
             utils.system(self.sudo + '/bin/true')
         except:
-            raise TestError('Unable to run as nobody')
+            raise error.TestError('Unable to run as nobody')
 
         if (db_type == 'pgsql'):
             self.execute_pgsql(build, num_threads, max_time, read_only, args)
@@ -67,7 +70,7 @@
         time.sleep(5)
 
         try:
-            base_cmd = self.srcdir + '/sysbench/sysbench --test=oltp '
+            base_cmd = self.srcdir + '/sysbench/sysbench --test=oltp ' \
                        '--db-driver=pgsql --pgsql-user=' + self.dbuser
 
             if build == 1:
@@ -125,7 +128,7 @@
         time.sleep(5)
 
         try:
-            base_cmd = self.srcdir + '/sysbench/sysbench --test=oltp '
+            base_cmd = self.srcdir + '/sysbench/sysbench --test=oltp ' \
                                      '--db-driver=mysql --mysql-user=root'
 
             if build == 1: