summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlmr <lmr@592f7852-d20e-0410-864c-8624ca9c26a4>2010-11-08 17:59:07 +0000
committerlmr <lmr@592f7852-d20e-0410-864c-8624ca9c26a4>2010-11-08 17:59:07 +0000
commit5bbb483d5e3b084137c9dc701afe82f7bbd4abe1 (patch)
tree8fa977996a0c4d32734701bb06ac4e3c6dfabe4a
parent9eae246e1816fb90e6c58bd7f81bd61d4b922c96 (diff)
Massive permission and indentation fix on the autotest tree
Once again I went through the autotest tree with my automated script to check all autotest source, and discovered several places that needed permission and indentation (including trailing whitespace) fixes. I have checked the generated patch and indeed it looks OK. Will commit this shortly, as preparation for autotest 0.13. Signed-off-by: Lucas Meneghel Rodrigues <lmr@redhat.com> git-svn-id: svn://test.kernel.org/autotest/trunk@4907 592f7852-d20e-0410-864c-8624ca9c26a4
-rwxr-xr-x[-rw-r--r--]client/common_lib/magic.py0
-rw-r--r--client/profilers/cpistat/cpistat.py2
-rw-r--r--client/tests/hackbench/hackbench.py4
-rw-r--r--[-rwxr-xr-x]client/tests/iozone/iozone.py0
-rw-r--r--[-rwxr-xr-x]client/tests/kvm/deps/finish.exebin31007 -> 31007 bytes
-rw-r--r--[-rwxr-xr-x]client/tests/kvm/deps/rss.exebin94518 -> 94518 bytes
-rw-r--r--[-rwxr-xr-x]client/tests/kvm/deps/whql_delete_machine_15.exebin5632 -> 5632 bytes
-rw-r--r--[-rwxr-xr-x]client/tests/kvm/deps/whql_submission_15.exebin10240 -> 10240 bytes
-rwxr-xr-xclient/tests/kvm/scripts/allocator.py4
-rwxr-xr-x[-rw-r--r--]client/tests/kvm/scripts/join_mcast.py0
-rwxr-xr-x[-rw-r--r--]client/tests/kvm/scripts/qemu-ifup-ipv60
-rwxr-xr-x[-rw-r--r--]client/tests/kvm/scripts/virtio_guest.py0
-rw-r--r--client/tests/kvm/tests/virtio_console.py3
-rw-r--r--client/tests/tracing_microbenchmark/tracers.py2
-rwxr-xr-x[-rw-r--r--]frontend/afe/resources_test.py0
-rwxr-xr-x[-rw-r--r--]frontend/client/gwt_dir0
-rw-r--r--frontend/migrations/062_drone_sets_unique.py6
-rwxr-xr-x[-rw-r--r--]frontend/planner/control_file_unittest.py0
-rwxr-xr-x[-rw-r--r--]frontend/planner/execution_engine_unittest.py0
-rwxr-xr-x[-rw-r--r--]frontend/planner/rpc_interface_unittest.py0
-rwxr-xr-x[-rw-r--r--]frontend/planner/rpc_utils_unittest.py0
-rwxr-xr-x[-rw-r--r--]frontend/tko/resources_test.py0
-rwxr-xr-x[-rw-r--r--]frontend/tko/rpc_interface_unittest.py0
-rw-r--r--scheduler/metahost_scheduler.py16
-rw-r--r--server/hosts/remote.py4
-rw-r--r--server/prebuild.py1
-rw-r--r--server/tests/netperf2/netperf2.py2
-rwxr-xr-x[-rw-r--r--]tko/job_serializer.py0
-rwxr-xr-x[-rw-r--r--]tko/job_serializer_unittest.py0
-rwxr-xr-x[-rw-r--r--]utils/external_packages.py0
30 files changed, 21 insertions, 23 deletions
diff --git a/client/common_lib/magic.py b/client/common_lib/magic.py
index 4f6a8e7d..4f6a8e7d 100644..100755
--- a/client/common_lib/magic.py
+++ b/client/common_lib/magic.py
diff --git a/client/profilers/cpistat/cpistat.py b/client/profilers/cpistat/cpistat.py
index 01524fbe..1a4328d9 100644
--- a/client/profilers/cpistat/cpistat.py
+++ b/client/profilers/cpistat/cpistat.py
@@ -17,7 +17,7 @@ class cpistat(profiler.profiler):
def start(self, test):
cmd = os.path.join(self.bindir, 'site_cpistat')
if not os.path.exists(cmd):
- cmd = os.path.join(self.bindir, 'cpistat')
+ cmd = os.path.join(self.bindir, 'cpistat')
logfile = open(os.path.join(test.profdir, "cpistat"), 'w')
p = subprocess.Popen(cmd, stdout=logfile,
stderr=subprocess.STDOUT)
diff --git a/client/tests/hackbench/hackbench.py b/client/tests/hackbench/hackbench.py
index 58618886..15e93d7b 100644
--- a/client/tests/hackbench/hackbench.py
+++ b/client/tests/hackbench/hackbench.py
@@ -18,9 +18,9 @@ class hackbench(test.test):
def setup(self):
os.chdir(self.srcdir)
if 'CC' in os.environ:
- cc = '$CC'
+ cc = '$CC'
else:
- cc = 'cc'
+ cc = 'cc'
utils.system('%s -lpthread hackbench.c -o hackbench' % cc)
diff --git a/client/tests/iozone/iozone.py b/client/tests/iozone/iozone.py
index 4fbec26a..4fbec26a 100755..100644
--- a/client/tests/iozone/iozone.py
+++ b/client/tests/iozone/iozone.py
diff --git a/client/tests/kvm/deps/finish.exe b/client/tests/kvm/deps/finish.exe
index a02b817d..a02b817d 100755..100644
--- a/client/tests/kvm/deps/finish.exe
+++ b/client/tests/kvm/deps/finish.exe
Binary files differ
diff --git a/client/tests/kvm/deps/rss.exe b/client/tests/kvm/deps/rss.exe
index 2c02a8f3..2c02a8f3 100755..100644
--- a/client/tests/kvm/deps/rss.exe
+++ b/client/tests/kvm/deps/rss.exe
Binary files differ
diff --git a/client/tests/kvm/deps/whql_delete_machine_15.exe b/client/tests/kvm/deps/whql_delete_machine_15.exe
index 7f571345..7f571345 100755..100644
--- a/client/tests/kvm/deps/whql_delete_machine_15.exe
+++ b/client/tests/kvm/deps/whql_delete_machine_15.exe
Binary files differ
diff --git a/client/tests/kvm/deps/whql_submission_15.exe b/client/tests/kvm/deps/whql_submission_15.exe
index 4f30aa80..4f30aa80 100755..100644
--- a/client/tests/kvm/deps/whql_submission_15.exe
+++ b/client/tests/kvm/deps/whql_submission_15.exe
Binary files differ
diff --git a/client/tests/kvm/scripts/allocator.py b/client/tests/kvm/scripts/allocator.py
index 227745ad..09dc0042 100755
--- a/client/tests/kvm/scripts/allocator.py
+++ b/client/tests/kvm/scripts/allocator.py
@@ -12,7 +12,7 @@ import os, array, sys, struct, random, copy, inspect, tempfile, datetime, math
PAGE_SIZE = 4096 # machine page size
-TMPFS_OVERHEAD = 0.0022 # overhead on 1MB of write data
+TMPFS_OVERHEAD = 0.0022 # overhead on 1MB of write data
class MemFill(object):
@@ -34,7 +34,7 @@ class MemFill(object):
self.tmpdp = tempfile.mkdtemp()
ret_code = os.system("mount -o size=%dM tmpfs %s -t tmpfs" %
- ((mem+math.ceil(mem*TMPFS_OVERHEAD)),
+ ((mem+math.ceil(mem*TMPFS_OVERHEAD)),
self.tmpdp))
if ret_code != 0:
if os.getuid() != 0:
diff --git a/client/tests/kvm/scripts/join_mcast.py b/client/tests/kvm/scripts/join_mcast.py
index 350cd5fd..350cd5fd 100644..100755
--- a/client/tests/kvm/scripts/join_mcast.py
+++ b/client/tests/kvm/scripts/join_mcast.py
diff --git a/client/tests/kvm/scripts/qemu-ifup-ipv6 b/client/tests/kvm/scripts/qemu-ifup-ipv6
index d4b05929..d4b05929 100644..100755
--- a/client/tests/kvm/scripts/qemu-ifup-ipv6
+++ b/client/tests/kvm/scripts/qemu-ifup-ipv6
diff --git a/client/tests/kvm/scripts/virtio_guest.py b/client/tests/kvm/scripts/virtio_guest.py
index 4862ef2b..4862ef2b 100644..100755
--- a/client/tests/kvm/scripts/virtio_guest.py
+++ b/client/tests/kvm/scripts/virtio_guest.py
diff --git a/client/tests/kvm/tests/virtio_console.py b/client/tests/kvm/tests/virtio_console.py
index 008ec637..aa668e12 100644
--- a/client/tests/kvm/tests/virtio_console.py
+++ b/client/tests/kvm/tests/virtio_console.py
@@ -398,7 +398,7 @@ def run_virtio_console(test, params, env):
logging.debug("Executing '%s' on virtio_guest.py loop, vm: %s," +
"timeout: %s", command, vm[0].name, timeout)
vm[1].sendline(command)
- (match, data) = vm[1].read_until_last_line_matches(["PASS:",
+ (match, data) = vm[1].read_until_last_line_matches(["PASS:",
"FAIL:[Failed to execute]"],
timeout)
return (match, data)
@@ -948,4 +948,3 @@ def run_virtio_console(test, params, env):
vm[1].close()
vm[0].destroy(gracefully=False)
shutil.rmtree(vm[2])
-
diff --git a/client/tests/tracing_microbenchmark/tracers.py b/client/tests/tracing_microbenchmark/tracers.py
index bdd5194d..08ca7e33 100644
--- a/client/tests/tracing_microbenchmark/tracers.py
+++ b/client/tests/tracing_microbenchmark/tracers.py
@@ -56,5 +56,5 @@ class ftrace(base_tracer.Tracer):
cpu_key = '%s_%s' % (cpu, key)
total_key = 'total_' + key
results[cpu_key] = val
- results[total_key] = (results.get(total_key, 0) +
+ results[total_key] = (results.get(total_key, 0) +
results[cpu_key])
diff --git a/frontend/afe/resources_test.py b/frontend/afe/resources_test.py
index 9120335c..9120335c 100644..100755
--- a/frontend/afe/resources_test.py
+++ b/frontend/afe/resources_test.py
diff --git a/frontend/client/gwt_dir b/frontend/client/gwt_dir
index 2cf35768..2cf35768 100644..100755
--- a/frontend/client/gwt_dir
+++ b/frontend/client/gwt_dir
diff --git a/frontend/migrations/062_drone_sets_unique.py b/frontend/migrations/062_drone_sets_unique.py
index 3c031c60..738a0f04 100644
--- a/frontend/migrations/062_drone_sets_unique.py
+++ b/frontend/migrations/062_drone_sets_unique.py
@@ -41,9 +41,9 @@ def migrate_up(manager):
'GROUP BY drone_id HAVING COUNT(*) > 1')
rows = manager.execute(query)
if rows:
- raise Exception('Some drones are associated with more than one drone '
- 'set. Please remove all duplicates before running this '
- 'migration.')
+ raise Exception('Some drones are associated with more than one drone '
+ 'set. Please remove all duplicates before running this '
+ 'migration.')
manager.execute_script(UP_SQL)
if db_utils.check_index_exists(manager, 'afe_drone_sets_drones',
diff --git a/frontend/planner/control_file_unittest.py b/frontend/planner/control_file_unittest.py
index 9f3263db..9f3263db 100644..100755
--- a/frontend/planner/control_file_unittest.py
+++ b/frontend/planner/control_file_unittest.py
diff --git a/frontend/planner/execution_engine_unittest.py b/frontend/planner/execution_engine_unittest.py
index a65978f2..a65978f2 100644..100755
--- a/frontend/planner/execution_engine_unittest.py
+++ b/frontend/planner/execution_engine_unittest.py
diff --git a/frontend/planner/rpc_interface_unittest.py b/frontend/planner/rpc_interface_unittest.py
index 30366bf2..30366bf2 100644..100755
--- a/frontend/planner/rpc_interface_unittest.py
+++ b/frontend/planner/rpc_interface_unittest.py
diff --git a/frontend/planner/rpc_utils_unittest.py b/frontend/planner/rpc_utils_unittest.py
index 6d97dd19..6d97dd19 100644..100755
--- a/frontend/planner/rpc_utils_unittest.py
+++ b/frontend/planner/rpc_utils_unittest.py
diff --git a/frontend/tko/resources_test.py b/frontend/tko/resources_test.py
index 0f8deaef..0f8deaef 100644..100755
--- a/frontend/tko/resources_test.py
+++ b/frontend/tko/resources_test.py
diff --git a/frontend/tko/rpc_interface_unittest.py b/frontend/tko/rpc_interface_unittest.py
index 6649a637..6649a637 100644..100755
--- a/frontend/tko/rpc_interface_unittest.py
+++ b/frontend/tko/rpc_interface_unittest.py
diff --git a/scheduler/metahost_scheduler.py b/scheduler/metahost_scheduler.py
index 9588e952..98f49bed 100644
--- a/scheduler/metahost_scheduler.py
+++ b/scheduler/metahost_scheduler.py
@@ -54,16 +54,16 @@ class MetahostScheduler(object):
def schedule_metahost(self, queue_entry, scheduling_utility):
- """Schedule the given queue entry, if possible.
+ """Schedule the given queue entry, if possible.
- This method should make necessary database changes culminating in
- assigning a host to the given queue entry in the database. It may
- take no action if no host can be assigned currently.
+ This method should make necessary database changes culminating in
+ assigning a host to the given queue entry in the database. It may
+ take no action if no host can be assigned currently.
- @param queue_entry: a HostQueueEntry DBObject
- @param scheduling_utility: a HostSchedulingUtility object
- """
- raise NotImplementedError
+ @param queue_entry: a HostQueueEntry DBObject
+ @param scheduling_utility: a HostSchedulingUtility object
+ """
+ raise NotImplementedError
def recovery_on_startup(self):
diff --git a/server/hosts/remote.py b/server/hosts/remote.py
index e46bc1b6..fe6452d0 100644
--- a/server/hosts/remote.py
+++ b/server/hosts/remote.py
@@ -230,8 +230,8 @@ class RemoteHost(base_classes.Host):
keyvals = utils.read_keyval(keyval_path)
all_labels = keyvals.get('labels', '')
if all_labels:
- all_labels = all_labels.split(',')
- return [urllib.unquote(label) for label in all_labels]
+ all_labels = all_labels.split(',')
+ return [urllib.unquote(label) for label in all_labels]
return []
diff --git a/server/prebuild.py b/server/prebuild.py
index 4d786050..b13fd7b5 100644
--- a/server/prebuild.py
+++ b/server/prebuild.py
@@ -61,4 +61,3 @@ def setup(autotest_client_dir, client_test_dir):
# instantiate a client_test instance.
client_test = init_test(client_test_dir)
client_setup_job.setup_test(client_test)
-
diff --git a/server/tests/netperf2/netperf2.py b/server/tests/netperf2/netperf2.py
index 604e4c89..108dab8b 100644
--- a/server/tests/netperf2/netperf2.py
+++ b/server/tests/netperf2/netperf2.py
@@ -33,7 +33,7 @@ class netperf2(test.test):
"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)
diff --git a/tko/job_serializer.py b/tko/job_serializer.py
index f9502068..f9502068 100644..100755
--- a/tko/job_serializer.py
+++ b/tko/job_serializer.py
diff --git a/tko/job_serializer_unittest.py b/tko/job_serializer_unittest.py
index 7cad8929..7cad8929 100644..100755
--- a/tko/job_serializer_unittest.py
+++ b/tko/job_serializer_unittest.py
diff --git a/utils/external_packages.py b/utils/external_packages.py
index d505eef8..d505eef8 100644..100755
--- a/utils/external_packages.py
+++ b/utils/external_packages.py