You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2011/10/21 21:20:02 UTC

svn commit: r1187516 - in /incubator/accumulo/trunk/test/system: auto/ auto/simple/ auto/stress/ bench/cloudstone1/ bench/cloudstone2/ bench/cloudstone3/ bench/cloudstone4/ bench/cloudstone5/ bench/cloudstone6/ bench/cloudstone7/ bench/cloudstone8/ ben...

Author: ecn
Date: Fri Oct 21 19:19:58 2011
New Revision: 1187516

URL: http://svn.apache.org/viewvc?rev=1187516&view=rev
Log:
ACCUMULO=42: make the python files consistent; leave shbang line, move imports below the license

Modified:
    incubator/accumulo/trunk/test/system/auto/TestUtils.py
    incubator/accumulo/trunk/test/system/auto/config.py
    incubator/accumulo/trunk/test/system/auto/simple/addSplit.py
    incubator/accumulo/trunk/test/system/auto/simple/aggregation.py
    incubator/accumulo/trunk/test/system/auto/simple/baditerminc.py
    incubator/accumulo/trunk/test/system/auto/simple/batchScanSplit.py
    incubator/accumulo/trunk/test/system/auto/simple/batchWriterFlush.py
    incubator/accumulo/trunk/test/system/auto/simple/binary.py
    incubator/accumulo/trunk/test/system/auto/simple/bloom.py
    incubator/accumulo/trunk/test/system/auto/simple/bulk.py
    incubator/accumulo/trunk/test/system/auto/simple/bulkFile.py
    incubator/accumulo/trunk/test/system/auto/simple/bulkSplitOptimization.py
    incubator/accumulo/trunk/test/system/auto/simple/compaction.py
    incubator/accumulo/trunk/test/system/auto/simple/concurrency.py
    incubator/accumulo/trunk/test/system/auto/simple/constraint.py
    incubator/accumulo/trunk/test/system/auto/simple/createAndUse.py
    incubator/accumulo/trunk/test/system/auto/simple/delete.py
    incubator/accumulo/trunk/test/system/auto/simple/deleteEverything.py
    incubator/accumulo/trunk/test/system/auto/simple/deleterows.py
    incubator/accumulo/trunk/test/system/auto/simple/dynamic.py
    incubator/accumulo/trunk/test/system/auto/simple/examples.py
    incubator/accumulo/trunk/test/system/auto/simple/gc.py
    incubator/accumulo/trunk/test/system/auto/simple/largeRow.py
    incubator/accumulo/trunk/test/system/auto/simple/mapreduce.py
    incubator/accumulo/trunk/test/system/auto/simple/masterFailover.py
    incubator/accumulo/trunk/test/system/auto/simple/maxOpen.py
    incubator/accumulo/trunk/test/system/auto/simple/merge.py
    incubator/accumulo/trunk/test/system/auto/simple/nativeMap.py
    incubator/accumulo/trunk/test/system/auto/simple/range.py
    incubator/accumulo/trunk/test/system/auto/simple/readwrite.py
    incubator/accumulo/trunk/test/system/auto/simple/rename.py
    incubator/accumulo/trunk/test/system/auto/simple/rowDelete.py
    incubator/accumulo/trunk/test/system/auto/simple/scanIter.py
    incubator/accumulo/trunk/test/system/auto/simple/scanSessionTimeout.py
    incubator/accumulo/trunk/test/system/auto/simple/security.py
    incubator/accumulo/trunk/test/system/auto/simple/serverSideError.py
    incubator/accumulo/trunk/test/system/auto/simple/shell.py
    incubator/accumulo/trunk/test/system/auto/simple/shutdown.py
    incubator/accumulo/trunk/test/system/auto/simple/simpleBalancer.py
    incubator/accumulo/trunk/test/system/auto/simple/split.py
    incubator/accumulo/trunk/test/system/auto/simple/splitRecovery.py
    incubator/accumulo/trunk/test/system/auto/simple/start.py
    incubator/accumulo/trunk/test/system/auto/simple/table.py
    incubator/accumulo/trunk/test/system/auto/simple/tablets.py
    incubator/accumulo/trunk/test/system/auto/simple/visibility.py
    incubator/accumulo/trunk/test/system/auto/simple/wal.py
    incubator/accumulo/trunk/test/system/auto/simple/zoo.py
    incubator/accumulo/trunk/test/system/auto/simple/zooCacheTest.py
    incubator/accumulo/trunk/test/system/auto/sleep.py
    incubator/accumulo/trunk/test/system/auto/stress/batchWrite.py
    incubator/accumulo/trunk/test/system/auto/stress/binary.py
    incubator/accumulo/trunk/test/system/auto/stress/halfDead.py
    incubator/accumulo/trunk/test/system/auto/stress/logger.py
    incubator/accumulo/trunk/test/system/auto/stress/manyScanners.py
    incubator/accumulo/trunk/test/system/auto/stress/msplit.py
    incubator/accumulo/trunk/test/system/auto/stress/restart.py
    incubator/accumulo/trunk/test/system/auto/stress/table.py
    incubator/accumulo/trunk/test/system/bench/cloudstone1/__init__.py
    incubator/accumulo/trunk/test/system/bench/cloudstone1/cloudstone1.py
    incubator/accumulo/trunk/test/system/bench/cloudstone2/__init__.py
    incubator/accumulo/trunk/test/system/bench/cloudstone2/cloudstone2.py
    incubator/accumulo/trunk/test/system/bench/cloudstone3/__init__.py
    incubator/accumulo/trunk/test/system/bench/cloudstone3/cloudstone3.py
    incubator/accumulo/trunk/test/system/bench/cloudstone4/__init__.py
    incubator/accumulo/trunk/test/system/bench/cloudstone4/cloudstone4.py
    incubator/accumulo/trunk/test/system/bench/cloudstone5/__init__.py
    incubator/accumulo/trunk/test/system/bench/cloudstone5/cloudstone5.py
    incubator/accumulo/trunk/test/system/bench/cloudstone6/__init__.py
    incubator/accumulo/trunk/test/system/bench/cloudstone6/cloudstone6.py
    incubator/accumulo/trunk/test/system/bench/cloudstone7/__init__.py
    incubator/accumulo/trunk/test/system/bench/cloudstone7/cloudstone7.py
    incubator/accumulo/trunk/test/system/bench/cloudstone8/__init__.py
    incubator/accumulo/trunk/test/system/bench/cloudstone8/cloudstone8.py
    incubator/accumulo/trunk/test/system/bench/lib/Benchmark.py
    incubator/accumulo/trunk/test/system/bench/lib/CreateTablesBenchmark.py
    incubator/accumulo/trunk/test/system/bench/lib/IngestBenchmark.py
    incubator/accumulo/trunk/test/system/bench/lib/RowHashBenchmark.py
    incubator/accumulo/trunk/test/system/bench/lib/TableSplitsBenchmark.py
    incubator/accumulo/trunk/test/system/bench/lib/TeraSortBenchmark.py
    incubator/accumulo/trunk/test/system/bench/lib/__init__.py
    incubator/accumulo/trunk/test/system/bench/lib/cloudshell.py
    incubator/accumulo/trunk/test/system/bench/lib/options.py
    incubator/accumulo/trunk/test/system/bench/lib/path.py
    incubator/accumulo/trunk/test/system/bench/lib/runner.py
    incubator/accumulo/trunk/test/system/bench/lib/slaves.py
    incubator/accumulo/trunk/test/system/bench/lib/util.py

Modified: incubator/accumulo/trunk/test/system/auto/TestUtils.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/TestUtils.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/TestUtils.py (original)
+++ incubator/accumulo/trunk/test/system/auto/TestUtils.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-from subprocess import Popen as BasePopen, PIPE
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ from subprocess import Popen as BasePope
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from subprocess import Popen as BasePopen, PIPE
+
 import os
 import time
 import logging
@@ -92,13 +92,13 @@ class TestUtilsMixin:
         cmd = map(str, cmd)
         log.debug('%s: %s', host, ' '.join(cmd))
         if host == 'localhost':
-            os.environ['ACCUMULO_TSERVER_OPTS']='-Xmx1200m -Xms1000m '
+            os.environ['ACCUMULO_TSERVER_OPTS']='-Xmx500m '
             os.environ['ACCUMULO_GENERAL_OPTS']='-Dorg.apache.accumulo.config.file=%s ' % SITE
             os.environ['ACCUMULO_LOG_DIR']= ACCUMULO_HOME + '/logs/' + ID
             return Popen(cmd, stdout=PIPE, stderr=PIPE, **opts)
         else:
             cp = 'HADOOP_CLASSPATH=%s' % os.environ.get('HADOOP_CLASSPATH','')
-            jo = "ACCUMULO_TSERVER_OPTS='-Xmx500m -Xms500m'"
+            jo = "ACCUMULO_TSERVER_OPTS='-Xmx500m '"
             go = "ACCUMULO_GENERAL_OPTS='-Dorg.apache.accumulo.config.file=%s'" % SITE
             ld = 'ACCUMULO_LOG_DIR=%s/logs/%s' % (ACCUMULO_HOME, ID)
             execcmd = ['ssh', '-q', host, cp, jo, go, ld] + quote(cmd)

Modified: incubator/accumulo/trunk/test/system/auto/config.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/config.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/config.py (original)
+++ incubator/accumulo/trunk/test/system/auto/config.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.

Modified: incubator/accumulo/trunk/test/system/auto/simple/addSplit.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/addSplit.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/addSplit.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/addSplit.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-from JavaTest import JavaTest
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ from JavaTest import JavaTest
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from JavaTest import JavaTest
+
 import unittest
 
 class AddSplitTest(JavaTest):

Modified: incubator/accumulo/trunk/test/system/auto/simple/aggregation.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/aggregation.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/aggregation.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/aggregation.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import os
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ import os
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import os
+
 import logging
 import unittest
 import time

Modified: incubator/accumulo/trunk/test/system/auto/simple/baditerminc.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/baditerminc.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/baditerminc.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/baditerminc.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-from JavaTest import JavaTest
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ from JavaTest import JavaTest
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from JavaTest import JavaTest
+
 import unittest
 
 class BadIterMincTest(JavaTest):

Modified: incubator/accumulo/trunk/test/system/auto/simple/batchScanSplit.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/batchScanSplit.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/batchScanSplit.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/batchScanSplit.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-from JavaTest import JavaTest
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ from JavaTest import JavaTest
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from JavaTest import JavaTest
+
 import unittest
 
 class BatchScanSplitTest(JavaTest):

Modified: incubator/accumulo/trunk/test/system/auto/simple/batchWriterFlush.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/batchWriterFlush.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/batchWriterFlush.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/batchWriterFlush.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-from JavaTest import JavaTest
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ from JavaTest import JavaTest
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from JavaTest import JavaTest
+
 import unittest
 
 class BatchWriterFlushTest(JavaTest):

Modified: incubator/accumulo/trunk/test/system/auto/simple/binary.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/binary.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/binary.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/binary.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import os
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ import os
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import os
+
 import unittest
 import time
 

Modified: incubator/accumulo/trunk/test/system/auto/simple/bloom.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/bloom.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/bloom.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/bloom.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-from JavaTest import JavaTest
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ from JavaTest import JavaTest
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from JavaTest import JavaTest
+
 import unittest, os
 
 class BloomFilterTest(JavaTest):

Modified: incubator/accumulo/trunk/test/system/auto/simple/bulk.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/bulk.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/bulk.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/bulk.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import os
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ import os
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import os
+
 import logging
 import unittest
 import time

Modified: incubator/accumulo/trunk/test/system/auto/simple/bulkFile.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/bulkFile.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/bulkFile.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/bulkFile.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-from JavaTest import JavaTest
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ from JavaTest import JavaTest
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from JavaTest import JavaTest
+
 import unittest
 
 class BulkFileTest(JavaTest):

Modified: incubator/accumulo/trunk/test/system/auto/simple/bulkSplitOptimization.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/bulkSplitOptimization.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/bulkSplitOptimization.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/bulkSplitOptimization.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-from JavaTest import JavaTest
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ from JavaTest import JavaTest
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from JavaTest import JavaTest
+
 import unittest
 
 class BulkSplitOptimizationTest(JavaTest):

Modified: incubator/accumulo/trunk/test/system/auto/simple/compaction.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/compaction.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/compaction.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/compaction.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import os
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ import os
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import os
+
 import logging
 import unittest
 from simple.bulk import SimpleBulkTest

Modified: incubator/accumulo/trunk/test/system/auto/simple/concurrency.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/concurrency.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/concurrency.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/concurrency.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-from JavaTest import JavaTest
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ from JavaTest import JavaTest
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from JavaTest import JavaTest
+
 import unittest
 
 class ConcurrencyTest(JavaTest):

Modified: incubator/accumulo/trunk/test/system/auto/simple/constraint.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/constraint.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/constraint.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/constraint.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-from JavaTest import JavaTest
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ from JavaTest import JavaTest
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from JavaTest import JavaTest
+
 import unittest
 
 class ConstraintTest(JavaTest):

Modified: incubator/accumulo/trunk/test/system/auto/simple/createAndUse.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/createAndUse.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/createAndUse.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/createAndUse.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-from JavaTest import JavaTest
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ from JavaTest import JavaTest
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from JavaTest import JavaTest
+
 import unittest
 
 class CreateAndUseTest(JavaTest):

Modified: incubator/accumulo/trunk/test/system/auto/simple/delete.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/delete.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/delete.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/delete.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import os
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ import os
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import os
+
 import logging
 import unittest
 import time

Modified: incubator/accumulo/trunk/test/system/auto/simple/deleteEverything.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/deleteEverything.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/deleteEverything.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/deleteEverything.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-from JavaTest import JavaTest
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ from JavaTest import JavaTest
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from JavaTest import JavaTest
+
 import unittest
 
 class DeleteEverythingTest(JavaTest):

Modified: incubator/accumulo/trunk/test/system/auto/simple/deleterows.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/deleterows.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/deleterows.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/deleterows.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-from JavaTest import JavaTest
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ from JavaTest import JavaTest
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from JavaTest import JavaTest
+
 import unittest
 
 class DeleteRowsTest(JavaTest):

Modified: incubator/accumulo/trunk/test/system/auto/simple/dynamic.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/dynamic.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/dynamic.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/dynamic.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import os
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ import os
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import os
+
 import logging
 import unittest
 import time

Modified: incubator/accumulo/trunk/test/system/auto/simple/examples.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/examples.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/examples.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/examples.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import os
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ import os
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import os
+
 import logging
 import unittest
 import time

Modified: incubator/accumulo/trunk/test/system/auto/simple/gc.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/gc.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/gc.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/gc.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import os
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ import os
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import os
+
 import glob
 import logging
 import unittest

Modified: incubator/accumulo/trunk/test/system/auto/simple/largeRow.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/largeRow.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/largeRow.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/largeRow.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-from JavaTest import JavaTest
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ from JavaTest import JavaTest
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from JavaTest import JavaTest
+
 import unittest
 
 class LargeRowTest(JavaTest):

Modified: incubator/accumulo/trunk/test/system/auto/simple/mapreduce.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/mapreduce.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/mapreduce.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/mapreduce.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import os
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ import os
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import os
+
 import logging
 import unittest
 import time

Modified: incubator/accumulo/trunk/test/system/auto/simple/masterFailover.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/masterFailover.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/masterFailover.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/masterFailover.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-from simple.readwrite import SunnyDayTest
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -16,6 +14,8 @@ from simple.readwrite import SunnyDayTes
 # limitations under the License.
 
 
+from simple.readwrite import SunnyDayTest
+
 import logging
 log = logging.getLogger('test.auto')
 

Modified: incubator/accumulo/trunk/test/system/auto/simple/maxOpen.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/maxOpen.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/maxOpen.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/maxOpen.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-from JavaTest import JavaTest
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ from JavaTest import JavaTest
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from JavaTest import JavaTest
+
 import unittest
 
 class MaxOpenTest(JavaTest):

Modified: incubator/accumulo/trunk/test/system/auto/simple/merge.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/merge.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/merge.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/merge.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import logging
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ import logging
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import logging
+
 import unittest
 
 from TestUtils import TestUtilsMixin

Modified: incubator/accumulo/trunk/test/system/auto/simple/nativeMap.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/nativeMap.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/nativeMap.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/nativeMap.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import os
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ import os
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import os
+
 import unittest
 import time
 

Modified: incubator/accumulo/trunk/test/system/auto/simple/range.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/range.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/range.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/range.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-from JavaTest import JavaTest
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ from JavaTest import JavaTest
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from JavaTest import JavaTest
+
 import unittest
 
 class RangeTest(JavaTest):

Modified: incubator/accumulo/trunk/test/system/auto/simple/readwrite.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/readwrite.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/readwrite.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/readwrite.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import os
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ import os
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import os
+
 import logging
 import unittest
 import time

Modified: incubator/accumulo/trunk/test/system/auto/simple/rename.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/rename.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/rename.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/rename.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import os
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ import os
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import os
+
 import logging
 import unittest
 import time

Modified: incubator/accumulo/trunk/test/system/auto/simple/rowDelete.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/rowDelete.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/rowDelete.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/rowDelete.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-from JavaTest import JavaTest
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ from JavaTest import JavaTest
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from JavaTest import JavaTest
+
 import unittest
 
 class RowDeleteTest(JavaTest):

Modified: incubator/accumulo/trunk/test/system/auto/simple/scanIter.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/scanIter.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/scanIter.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/scanIter.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-from JavaTest import JavaTest
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ from JavaTest import JavaTest
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from JavaTest import JavaTest
+
 import unittest
 
 class ScanIteratorTest(JavaTest):

Modified: incubator/accumulo/trunk/test/system/auto/simple/scanSessionTimeout.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/scanSessionTimeout.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/scanSessionTimeout.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/scanSessionTimeout.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-from JavaTest import JavaTest
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ from JavaTest import JavaTest
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from JavaTest import JavaTest
+
 import unittest
 
 class ScanSessionTimeOutTest(JavaTest):

Modified: incubator/accumulo/trunk/test/system/auto/simple/security.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/security.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/security.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/security.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-from JavaTest import JavaTest
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ from JavaTest import JavaTest
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from JavaTest import JavaTest
+
 import unittest
 
 class SystemPermissionsTest(JavaTest):

Modified: incubator/accumulo/trunk/test/system/auto/simple/serverSideError.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/serverSideError.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/serverSideError.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/serverSideError.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-from JavaTest import JavaTest
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ from JavaTest import JavaTest
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from JavaTest import JavaTest
+
 import unittest
 
 class ServerSideErrorTest(JavaTest):

Modified: incubator/accumulo/trunk/test/system/auto/simple/shell.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/shell.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/shell.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/shell.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import os
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ import os
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import os
+
 import logging
 import unittest
 import time

Modified: incubator/accumulo/trunk/test/system/auto/simple/shutdown.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/shutdown.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/shutdown.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/shutdown.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import os
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ import os
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import os
+
 import logging
 import unittest
 import sleep

Modified: incubator/accumulo/trunk/test/system/auto/simple/simpleBalancer.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/simpleBalancer.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/simpleBalancer.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/simpleBalancer.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import os
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ import os
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import os
+
 import logging
 import unittest
 import time

Modified: incubator/accumulo/trunk/test/system/auto/simple/split.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/split.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/split.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/split.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import os
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ import os
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import os
+
 import logging
 import unittest
 import time

Modified: incubator/accumulo/trunk/test/system/auto/simple/splitRecovery.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/splitRecovery.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/splitRecovery.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/splitRecovery.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-from JavaTest import JavaTest
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ from JavaTest import JavaTest
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from JavaTest import JavaTest
+
 import unittest
 
 class SplitRecoveryTest(JavaTest):

Modified: incubator/accumulo/trunk/test/system/auto/simple/start.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/start.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/start.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/start.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import unittest
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ import unittest
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import unittest
+
 import os
 from TestUtils import TestUtilsMixin, ROOT, ROOT_PASSWORD, ACCUMULO_DIR
 from subprocess import PIPE

Modified: incubator/accumulo/trunk/test/system/auto/simple/table.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/table.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/table.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/table.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import os
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ import os
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import os
+
 import logging
 import unittest
 import time

Modified: incubator/accumulo/trunk/test/system/auto/simple/tablets.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/tablets.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/tablets.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/tablets.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import os
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ import os
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import os
+
 import logging
 import unittest
 import time

Modified: incubator/accumulo/trunk/test/system/auto/simple/visibility.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/visibility.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/visibility.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/visibility.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-from JavaTest import JavaTest
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ from JavaTest import JavaTest
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from JavaTest import JavaTest
+
 import unittest
 
 class VisibilityTest(JavaTest):

Modified: incubator/accumulo/trunk/test/system/auto/simple/wal.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/wal.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/wal.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/wal.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.

Modified: incubator/accumulo/trunk/test/system/auto/simple/zoo.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/zoo.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/zoo.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/zoo.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import os
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ import os
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import os
+
 import logging
 import unittest
 import signal

Modified: incubator/accumulo/trunk/test/system/auto/simple/zooCacheTest.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/simple/zooCacheTest.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/simple/zooCacheTest.py (original)
+++ incubator/accumulo/trunk/test/system/auto/simple/zooCacheTest.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import os
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ import os
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import os
+
 import unittest
 import time
 

Modified: incubator/accumulo/trunk/test/system/auto/sleep.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/sleep.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/sleep.py (original)
+++ incubator/accumulo/trunk/test/system/auto/sleep.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-scale = 1.0
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ scale = 1.0
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+scale = 1.0
+
 
 def sleep(secs):
     import time

Modified: incubator/accumulo/trunk/test/system/auto/stress/batchWrite.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/stress/batchWrite.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/stress/batchWrite.py (original)
+++ incubator/accumulo/trunk/test/system/auto/stress/batchWrite.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import os
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ import os
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import os
+
 import logging
 import unittest
 import time

Modified: incubator/accumulo/trunk/test/system/auto/stress/binary.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/stress/binary.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/stress/binary.py (original)
+++ incubator/accumulo/trunk/test/system/auto/stress/binary.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import unittest
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ import unittest
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import unittest
+
 import os
 import logging
 

Modified: incubator/accumulo/trunk/test/system/auto/stress/halfDead.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/stress/halfDead.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/stress/halfDead.py (original)
+++ incubator/accumulo/trunk/test/system/auto/stress/halfDead.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import os
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ import os
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import os
+
 import time
 import signal
 import unittest

Modified: incubator/accumulo/trunk/test/system/auto/stress/logger.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/stress/logger.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/stress/logger.py (original)
+++ incubator/accumulo/trunk/test/system/auto/stress/logger.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-from subprocess import PIPE
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ from subprocess import PIPE
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from subprocess import PIPE
+
 from TestUtils import TestUtilsMixin, ROOT, ROOT_PASSWORD
 
 import logging

Modified: incubator/accumulo/trunk/test/system/auto/stress/manyScanners.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/stress/manyScanners.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/stress/manyScanners.py (original)
+++ incubator/accumulo/trunk/test/system/auto/stress/manyScanners.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-from JavaTest import JavaTest
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ from JavaTest import JavaTest
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from JavaTest import JavaTest
+
 import unittest
 
 class CreateManyScannersTest(JavaTest):

Modified: incubator/accumulo/trunk/test/system/auto/stress/msplit.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/stress/msplit.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/stress/msplit.py (original)
+++ incubator/accumulo/trunk/test/system/auto/stress/msplit.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import os
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ import os
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import os
+
 import logging
 import unittest
 import time

Modified: incubator/accumulo/trunk/test/system/auto/stress/restart.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/stress/restart.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/stress/restart.py (original)
+++ incubator/accumulo/trunk/test/system/auto/stress/restart.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-from simple.readwrite import SunnyDayTest
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ from simple.readwrite import SunnyDayTes
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from simple.readwrite import SunnyDayTest
+
 import unittest
 import logging
 import os

Modified: incubator/accumulo/trunk/test/system/auto/stress/table.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/stress/table.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/stress/table.py (original)
+++ incubator/accumulo/trunk/test/system/auto/stress/table.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import unittest
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ import unittest
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import unittest
+
 import os
 from TestUtils import TestUtilsMixin, ROOT, ROOT_PASSWORD, ACCUMULO_DIR
 

Modified: incubator/accumulo/trunk/test/system/bench/cloudstone1/__init__.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/bench/cloudstone1/__init__.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/bench/cloudstone1/__init__.py (original)
+++ incubator/accumulo/trunk/test/system/bench/cloudstone1/__init__.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-"this directory is a module"
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.

Modified: incubator/accumulo/trunk/test/system/bench/cloudstone1/cloudstone1.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/bench/cloudstone1/cloudstone1.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/bench/cloudstone1/cloudstone1.py (original)
+++ incubator/accumulo/trunk/test/system/bench/cloudstone1/cloudstone1.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import unittest
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ import unittest
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import unittest
+
 import time
 
 from lib import cloudshell

Modified: incubator/accumulo/trunk/test/system/bench/cloudstone2/__init__.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/bench/cloudstone2/__init__.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/bench/cloudstone2/__init__.py (original)
+++ incubator/accumulo/trunk/test/system/bench/cloudstone2/__init__.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-"This directory is a module"
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.

Modified: incubator/accumulo/trunk/test/system/bench/cloudstone2/cloudstone2.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/bench/cloudstone2/cloudstone2.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/bench/cloudstone2/cloudstone2.py (original)
+++ incubator/accumulo/trunk/test/system/bench/cloudstone2/cloudstone2.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import unittest
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -16,6 +14,8 @@ import unittest
 # limitations under the License.
 
 
+import unittest
+
 from lib import cloudshell
 from lib.IngestBenchmark import IngestBenchmark
 

Modified: incubator/accumulo/trunk/test/system/bench/cloudstone3/__init__.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/bench/cloudstone3/__init__.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/bench/cloudstone3/__init__.py (original)
+++ incubator/accumulo/trunk/test/system/bench/cloudstone3/__init__.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-"This directory is a module"
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.

Modified: incubator/accumulo/trunk/test/system/bench/cloudstone3/cloudstone3.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/bench/cloudstone3/cloudstone3.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/bench/cloudstone3/cloudstone3.py (original)
+++ incubator/accumulo/trunk/test/system/bench/cloudstone3/cloudstone3.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import unittest
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -16,6 +14,8 @@ import unittest
 # limitations under the License.
 
 
+import unittest
+
 from lib import cloudshell
 from lib.IngestBenchmark import IngestBenchmark
 

Modified: incubator/accumulo/trunk/test/system/bench/cloudstone4/__init__.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/bench/cloudstone4/__init__.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/bench/cloudstone4/__init__.py (original)
+++ incubator/accumulo/trunk/test/system/bench/cloudstone4/__init__.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-"this directory is a module"
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.

Modified: incubator/accumulo/trunk/test/system/bench/cloudstone4/cloudstone4.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/bench/cloudstone4/cloudstone4.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/bench/cloudstone4/cloudstone4.py (original)
+++ incubator/accumulo/trunk/test/system/bench/cloudstone4/cloudstone4.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import unittest
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -16,6 +14,8 @@ import unittest
 # limitations under the License.
 
 
+import unittest
+
 from lib import cloudshell
 from lib.TeraSortBenchmark import TeraSortBenchmark
 

Modified: incubator/accumulo/trunk/test/system/bench/cloudstone5/__init__.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/bench/cloudstone5/__init__.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/bench/cloudstone5/__init__.py (original)
+++ incubator/accumulo/trunk/test/system/bench/cloudstone5/__init__.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-"This directory is a module"
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.

Modified: incubator/accumulo/trunk/test/system/bench/cloudstone5/cloudstone5.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/bench/cloudstone5/cloudstone5.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/bench/cloudstone5/cloudstone5.py (original)
+++ incubator/accumulo/trunk/test/system/bench/cloudstone5/cloudstone5.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import unittest
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -16,6 +14,8 @@ import unittest
 # limitations under the License.
 
 
+import unittest
+
 from lib import cloudshell
 from lib.TableSplitsBenchmark import TableSplitsBenchmark
 

Modified: incubator/accumulo/trunk/test/system/bench/cloudstone6/__init__.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/bench/cloudstone6/__init__.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/bench/cloudstone6/__init__.py (original)
+++ incubator/accumulo/trunk/test/system/bench/cloudstone6/__init__.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-"This directory is a module"
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.

Modified: incubator/accumulo/trunk/test/system/bench/cloudstone6/cloudstone6.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/bench/cloudstone6/cloudstone6.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/bench/cloudstone6/cloudstone6.py (original)
+++ incubator/accumulo/trunk/test/system/bench/cloudstone6/cloudstone6.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import unittest
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -16,6 +14,8 @@ import unittest
 # limitations under the License.
 
 
+import unittest
+
 from lib import cloudshell
 from lib.CreateTablesBenchmark import CreateTablesBenchmark
 

Modified: incubator/accumulo/trunk/test/system/bench/cloudstone7/__init__.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/bench/cloudstone7/__init__.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/bench/cloudstone7/__init__.py (original)
+++ incubator/accumulo/trunk/test/system/bench/cloudstone7/__init__.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-"This directory is a module"
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.

Modified: incubator/accumulo/trunk/test/system/bench/cloudstone7/cloudstone7.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/bench/cloudstone7/cloudstone7.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/bench/cloudstone7/cloudstone7.py (original)
+++ incubator/accumulo/trunk/test/system/bench/cloudstone7/cloudstone7.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import unittest
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -16,6 +14,8 @@ import unittest
 # limitations under the License.
 
 
+import unittest
+
 from lib import cloudshell
 from lib.RowHashBenchmark import RowHashBenchmark
 

Modified: incubator/accumulo/trunk/test/system/bench/cloudstone8/__init__.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/bench/cloudstone8/__init__.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/bench/cloudstone8/__init__.py (original)
+++ incubator/accumulo/trunk/test/system/bench/cloudstone8/__init__.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-"this directory is a module"
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.

Modified: incubator/accumulo/trunk/test/system/bench/cloudstone8/cloudstone8.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/bench/cloudstone8/cloudstone8.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/bench/cloudstone8/cloudstone8.py (original)
+++ incubator/accumulo/trunk/test/system/bench/cloudstone8/cloudstone8.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import unittest
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -16,6 +14,8 @@ import unittest
 # limitations under the License.
 
 
+import unittest
+
 from lib import cloudshell
 from lib.TeraSortBenchmark import TeraSortBenchmark
 

Modified: incubator/accumulo/trunk/test/system/bench/lib/Benchmark.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/bench/lib/Benchmark.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/bench/lib/Benchmark.py (original)
+++ incubator/accumulo/trunk/test/system/bench/lib/Benchmark.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import time
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ import time
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import time
+
 import unittest
 import os
 import glob

Modified: incubator/accumulo/trunk/test/system/bench/lib/CreateTablesBenchmark.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/bench/lib/CreateTablesBenchmark.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/bench/lib/CreateTablesBenchmark.py (original)
+++ incubator/accumulo/trunk/test/system/bench/lib/CreateTablesBenchmark.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import unittest
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ import unittest
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import unittest
+
 import subprocess
 
 from lib import cloudshell, runner, path

Modified: incubator/accumulo/trunk/test/system/bench/lib/IngestBenchmark.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/bench/lib/IngestBenchmark.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/bench/lib/IngestBenchmark.py (original)
+++ incubator/accumulo/trunk/test/system/bench/lib/IngestBenchmark.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import unittest
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -16,6 +14,8 @@ import unittest
 # limitations under the License.
 
 
+import unittest
+
 from lib import cloudshell
 from lib.Benchmark import Benchmark
 from lib.slaves import runEach, slaveNames

Modified: incubator/accumulo/trunk/test/system/bench/lib/RowHashBenchmark.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/bench/lib/RowHashBenchmark.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/bench/lib/RowHashBenchmark.py (original)
+++ incubator/accumulo/trunk/test/system/bench/lib/RowHashBenchmark.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import unittest
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ import unittest
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import unittest
+
 import subprocess
 import os
 import glob

Modified: incubator/accumulo/trunk/test/system/bench/lib/TableSplitsBenchmark.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/bench/lib/TableSplitsBenchmark.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/bench/lib/TableSplitsBenchmark.py (original)
+++ incubator/accumulo/trunk/test/system/bench/lib/TableSplitsBenchmark.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import unittest
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ import unittest
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import unittest
+
 import subprocess
 import os
 import glob

Modified: incubator/accumulo/trunk/test/system/bench/lib/TeraSortBenchmark.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/bench/lib/TeraSortBenchmark.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/bench/lib/TeraSortBenchmark.py (original)
+++ incubator/accumulo/trunk/test/system/bench/lib/TeraSortBenchmark.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import unittest
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ import unittest
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import unittest
+
 import subprocess
 import os
 import glob

Modified: incubator/accumulo/trunk/test/system/bench/lib/__init__.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/bench/lib/__init__.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/bench/lib/__init__.py (original)
+++ incubator/accumulo/trunk/test/system/bench/lib/__init__.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-"This directory is a module"
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.

Modified: incubator/accumulo/trunk/test/system/bench/lib/cloudshell.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/bench/lib/cloudshell.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/bench/lib/cloudshell.py (original)
+++ incubator/accumulo/trunk/test/system/bench/lib/cloudshell.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import subprocess
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -16,6 +14,8 @@ import subprocess
 # limitations under the License.
 
 
+import subprocess
+
 from lib import path
 from lib import runner
 from lib.options import log

Modified: incubator/accumulo/trunk/test/system/bench/lib/options.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/bench/lib/options.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/bench/lib/options.py (original)
+++ incubator/accumulo/trunk/test/system/bench/lib/options.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.

Modified: incubator/accumulo/trunk/test/system/bench/lib/path.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/bench/lib/path.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/bench/lib/path.py (original)
+++ incubator/accumulo/trunk/test/system/bench/lib/path.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import os
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -16,6 +14,8 @@ import os
 # limitations under the License.
 
 
+import os
+
 HERE = os.path.dirname(__file__)
 ACCUMULO_HOME = os.path.normpath(
     os.path.join(HERE, *(os.pardir,)*4)

Modified: incubator/accumulo/trunk/test/system/bench/lib/runner.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/bench/lib/runner.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/bench/lib/runner.py (original)
+++ incubator/accumulo/trunk/test/system/bench/lib/runner.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.

Modified: incubator/accumulo/trunk/test/system/bench/lib/slaves.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/bench/lib/slaves.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/bench/lib/slaves.py (original)
+++ incubator/accumulo/trunk/test/system/bench/lib/slaves.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import fcntl
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ import fcntl
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import fcntl
+
 import os
 import time
 import select

Modified: incubator/accumulo/trunk/test/system/bench/lib/util.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/bench/lib/util.py?rev=1187516&r1=1187515&r2=1187516&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/bench/lib/util.py (original)
+++ incubator/accumulo/trunk/test/system/bench/lib/util.py Fri Oct 21 19:19:58 2011
@@ -1,5 +1,3 @@
-import time
-
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -15,6 +13,8 @@ import time
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import time
+
 
 def sleep(n):
     time.sleep(n)