commit 8b352856e457518fde6bab947d8fcdb3f53a39ad
author mbligh <mbligh@592f7852-d20e-0410-864c-8624ca9c26a4> Sat Jun 07 01:07:08 2008 +0000
committer mbligh <mbligh@592f7852-d20e-0410-864c-8624ca9c26a4> Sat Jun 07 01:07:08 2008 +0000
tree be004b94aff157e07f9c9a8ca13b84094c0dad76
parent 6b115f4317bbb1ebc403b4f5c773bb3d9887fd91

Manual whitespace cleanups and coding style fixes

Signed-off-by: Martin J. Bligh <mbligh@google.com>



git-svn-id: http://test.kernel.org/svn/autotest/trunk@1665 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 571c37f..aef3627 100644
--- a/client/tests/sysbench/sysbench.py
+++ b/client/tests/sysbench/sysbench.py
@@ -8,8 +8,7 @@
 
     # http://osdn.dl.sourceforge.net/sourceforge/sysbench/sysbench-0.4.8.tar.gz
     def setup(self, tarball = 'sysbench-0.4.8.tar.bz2'):
-        tarball = utils.unmap_url(self.bindir, tarball,
-                                           self.tmpdir)
+        tarball = utils.unmap_url(self.bindir, tarball, self.tmpdir)
         autotest_utils.extract_tarball_to_dir(tarball, self.srcdir)
         self.job.setup_dep(['pgsql', 'mysql'])
 
@@ -44,11 +43,9 @@
             raise TestError('Unable to run as nobody')
 
         if (db_type == 'pgsql'):
-            self.execute_pgsql(build, num_threads, max_time, \
-                    read_only, args)
+            self.execute_pgsql(build, num_threads, max_time, read_only, args)
         elif (db_type == 'mysql'):
-            self.execute_mysql(build, num_threads, max_time, \
-                    read_only, args)
+            self.execute_mysql(build, num_threads, max_time, read_only, args)
 
 
     def execute_pgsql(self, build, num_threads, max_time, read_only, args):
@@ -64,16 +61,14 @@
 
         # Database must be able to write its output into debugdir
         os.chown(self.debugdir, self.dbuid, 0)
-        utils.system(self.sudo + bin + '/pg_ctl -D ' + data + \
-                ' -l ' + log + ' start')
+        utils.system(self.sudo + bin + '/pg_ctl -D %s -l %s start' %(data, log))
 
         # Wait for database to start
         time.sleep(5)
 
         try:
-            base_cmd = self.srcdir + '/sysbench/sysbench ' + \
-                    '--test=oltp --db-driver=pgsql ' + \
-                    '--pgsql-user=' + self.dbuser
+            base_cmd = self.srcdir + '/sysbench/sysbench --test=oltp '
+                       '--db-driver=pgsql --pgsql-user=' + self.dbuser
 
             if build == 1:
                 utils.system(self.sudo + bin + '/createdb sbtest')
@@ -130,9 +125,8 @@
         time.sleep(5)
 
         try:
-            base_cmd = self.srcdir + '/sysbench/sysbench ' + \
-                    '--test=oltp --db-driver=mysql ' + \
-                    '--mysql-user=root'
+            base_cmd = self.srcdir + '/sysbench/sysbench --test=oltp '
+                                     '--db-driver=mysql --mysql-user=root'
 
             if build == 1:
                 utils.system('echo "create database sbtest" | ' + \