accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1430012 - in /accumulo/trunk/test/system/auto: TestUtils.py run.py
Date Mon, 07 Jan 2013 21:12:49 GMT
Author: ecn
Date: Mon Jan  7 21:12:49 2013
New Revision: 1430012

URL: http://svn.apache.org/viewvc?rev=1430012&view=rev
Log:
ACCUMULO-708 get functional tests working again

Modified:
    accumulo/trunk/test/system/auto/TestUtils.py
    accumulo/trunk/test/system/auto/run.py

Modified: accumulo/trunk/test/system/auto/TestUtils.py
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/system/auto/TestUtils.py?rev=1430012&r1=1430011&r2=1430012&view=diff
==============================================================================
--- accumulo/trunk/test/system/auto/TestUtils.py (original)
+++ accumulo/trunk/test/system/auto/TestUtils.py Mon Jan  7 21:12:49 2013
@@ -49,17 +49,17 @@ LOG_PROPERTIES= os.path.join(ACCUMULO_HO
 LOG_GENERIC = os.path.join(ACCUMULO_HOME, 'conf', 'generic_logger.xml')
 LOG_MONITOR = os.path.join(ACCUMULO_HOME, 'conf', 'monitor_logger.xml')
 General_CLASSPATH = """
-    $ACCUMULO_HOME/server/target/classes/,
+$ACCUMULO_HOME/server/target/classes/,
     $ACCUMULO_HOME/core/target/classes/,
     $ACCUMULO_HOME/start/target/classes/,
     $ACCUMULO_HOME/fate/target/classes/,
     $ACCUMULO_HOME/examples/instamo/target/classes,
     $ACCUMULO_HOME/examples/simple/target/classes,
-    $ACCUMULO_HOME/lib/[^.].$ACCUMULO_VERSION.jar, 
-    $ACCUMULO_HOME/lib/[^.].*.jar, 
-    $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
-    $HADOOP_HOME/conf,$HADOOP_HOME/[^.].*.jar, 
-    $HADOOP_HOME/lib/[^.].*.jar
+        $ACCUMULO_HOME/lib/[^.].*.jar,
+        $ZOOKEEPER_HOME/zookeeper[^.].*.jar,
+        $HADOOP_HOME/conf,
+        $HADOOP_HOME/[^.].*.jar,
+        $HADOOP_HOME/lib/[^.].*.jar,
 """
 
 log = logging.getLogger('test.auto')
@@ -108,7 +108,7 @@ class TestUtilsMixin:
     def runOn(self, host, cmd, **opts):
         cmd = map(str, cmd)
         log.debug('%s: %s', host, ' '.join(cmd))
-        if host == 'localhost':
+        if host == 'localhost' or host == socket.getfqdn():
             os.environ['ACCUMULO_TSERVER_OPTS']='-Xmx800m -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75
'
             os.environ['ACCUMULO_GENERAL_OPTS']=('-Dorg.apache.accumulo.config.file=%s' %
(SITE))
             os.environ['ACCUMULO_LOG_DIR']= ACCUMULO_HOME + '/logs/' + ID

Modified: accumulo/trunk/test/system/auto/run.py
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/system/auto/run.py?rev=1430012&r1=1430011&r2=1430012&view=diff
==============================================================================
--- accumulo/trunk/test/system/auto/run.py (original)
+++ accumulo/trunk/test/system/auto/run.py Mon Jan  7 21:12:49 2013
@@ -23,6 +23,7 @@ import unittest
 import glob
 import re
 import sys
+import socket
 from subprocess import Popen, PIPE
 
 from TestUtils import ACCUMULO_HOME, ACCUMULO_DIR
@@ -49,7 +50,7 @@ def parseArguments(parser, allTests):
         if hasattr(test, 'add_options'):
             test.add_options(parser)
     options, hosts = parser.parse_args()
-    options.hosts = hosts or ['localhost']
+    options.hosts = hosts or [socket.getfqdn()]
     return options
 
 def testName(test):



Mime
View raw message