accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1187508 - in /incubator/accumulo/trunk/test/system/auto: JavaTest.py stress/metadataMaxFiles.py stress/weird.py
Date Fri, 21 Oct 2011 19:06:02 GMT
Author: ecn
Date: Fri Oct 21 19:06:01 2011
New Revision: 1187508

URL: http://svn.apache.org/viewvc?rev=1187508&view=rev
Log:
ACCUMULO-46: more fixes for the functional tests

Modified:
    incubator/accumulo/trunk/test/system/auto/JavaTest.py
    incubator/accumulo/trunk/test/system/auto/stress/metadataMaxFiles.py
    incubator/accumulo/trunk/test/system/auto/stress/weird.py

Modified: incubator/accumulo/trunk/test/system/auto/JavaTest.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/JavaTest.py?rev=1187508&r1=1187507&r2=1187508&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/JavaTest.py (original)
+++ incubator/accumulo/trunk/test/system/auto/JavaTest.py Fri Oct 21 19:06:01 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,7 @@ import os
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import os
 import unittest
 import time
 import logging

Modified: incubator/accumulo/trunk/test/system/auto/stress/metadataMaxFiles.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/stress/metadataMaxFiles.py?rev=1187508&r1=1187507&r2=1187508&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/stress/metadataMaxFiles.py (original)
+++ incubator/accumulo/trunk/test/system/auto/stress/metadataMaxFiles.py Fri Oct 21 19:06:01
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
+
 from TestUtils import TestUtilsMixin
 import os
 
@@ -27,7 +27,7 @@ class MetadataMaxFiles(TestUtilsMixin, u
     order=75
 
     settings = TestUtilsMixin.settings.copy()
-    settings['tserver.compaction.major.delay'] = 0
+    settings['tserver.compaction.major.delay'] = 1
 
     def runTest(self):
         # Create a bunch of tables with splits to split the !METADATA table
@@ -40,13 +40,11 @@ class MetadataMaxFiles(TestUtilsMixin, u
         self.shell(self.masterHost(),
                    'config -t !METADATA -s table.split.threshold=10000\n' + 
                    ''.join(['createtable test%d -sf %s\nflush -t !METADATA\n' % (i, self.splitfile)
for i in range(5)]))
-        self.shutdown_accumulo()
+        self.shutdown_accumulo(150)
         
         # reconfigure accumulo to use a very small number of files
         self.stop_accumulo()
         self.settings['tserver.scan.files.open.max'] = 10
-        self.settings['tserver.compaction.major.files.open.max'] = 2
-        self.settings['tserver.compaction.major.concurrent.max'] = 1
         self.create_config_file(self.settings)
 
         # make sure the master knows about all the tables we created

Modified: incubator/accumulo/trunk/test/system/auto/stress/weird.py
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/test/system/auto/stress/weird.py?rev=1187508&r1=1187507&r2=1187508&view=diff
==============================================================================
--- incubator/accumulo/trunk/test/system/auto/stress/weird.py (original)
+++ incubator/accumulo/trunk/test/system/auto/stress/weird.py Fri Oct 21 19:06:01 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
@@ -38,6 +38,8 @@ class LateLastContact(SunnyDayTest):
     settings = SunnyDayTest.settings.copy()
     
     def runTest(self):
+        if not os.getenv("ZOOKEEPER_HOME"):
+            self.fail("ZOOKEEPER_HOME environment variable is not set please set the location
of ZOOKEEPER home in this environment variable")
         self.waitForStop(self.ingester, self.waitTime())
         cfg = os.path.join(ACCUMULO_HOME, 'conf', SITE)
         import config



Mime
View raw message