Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Conflicts:
test/system/auto/simple/readwrite.py
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/89c99622
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/89c99622
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/89c99622
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 89c996229dc259fd6c4555d97e1da7b0d0f2e7a7
Parents: 20cc9f4 d605ebb
Author: Mike Drob <md...@cloudera.com>
Authored: Tue Dec 31 13:37:29 2013 -0800
Committer: Mike Drob <md...@cloudera.com>
Committed: Tue Dec 31 13:37:29 2013 -0800
----------------------------------------------------------------------
test/system/auto/TestUtils.py | 8 ++++++--
test/system/auto/simple/readwrite.py | 5 ++---
test/system/auto/simple/zooCacheTest.py | 4 ++--
3 files changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/89c99622/test/system/auto/TestUtils.py
----------------------------------------------------------------------
diff --cc test/system/auto/TestUtils.py
index 32dc4b8,3101cf9..68d2a9c
--- a/test/system/auto/TestUtils.py
+++ b/test/system/auto/TestUtils.py
@@@ -47,7 -47,10 +47,8 @@@ if os.getenv('ACCUMULO_CONF_DIR')
else:
ACCUMULO_CONF_DIR = os.path.join(ACCUMULO_HOME, 'conf')
SITE = "test-" + ID
+ SITE_PATH = os.path.join(ACCUMULO_CONF_DIR, SITE)
-WALOG = os.path.join(ACCUMULO_HOME, 'walogs', ID)
-
LOG_PROPERTIES= os.path.join(ACCUMULO_CONF_DIR, 'log4j.properties')
LOG_GENERIC = os.path.join(ACCUMULO_CONF_DIR, 'generic_logger.xml')
LOG_MONITOR = os.path.join(ACCUMULO_CONF_DIR, 'monitor_logger.xml')
@@@ -252,10 -259,10 +253,10 @@@ class TestUtilsMixin
def stop_accumulo(self, signal=signal.SIGHUP):
log.info('killing accumulo processes everywhere')
for host in self.hosts:
- self.pkill(host, 'org.apache.accumulo.start', signal)
+ self.pkill(host, 'accumulo.config.file', signal)
def create_config_file(self, settings):
- fp = open(os.path.join(ACCUMULO_CONF_DIR, SITE), 'w')
+ fp = open(SITE_PATH, 'w')
fp.write('<configuration>\n')
settings = self.settings.copy()
settings.update({ 'instance.zookeeper.host': ZOOKEEPERS,
@@@ -442,10 -455,11 +446,10 @@@
['hadoop', 'fs', '-rmr', ACCUMULO_DIR]))
self.wait(self.runClassOn(self.masterHost(),
'org.apache.accumulo.server.util.DeleteZooInstance',
- [INSTANCE_NAME]))
- self.wait(self.runOn(self.masterHost(), ['rm', '-rf', WALOG]))
+ ['-i', INSTANCE_NAME]))
self.wait(self.runOn(self.masterHost(), ['rm', '-rf', ACCUMULO_HOME
+ '/logs/' + ID]))
self.clean_logging()
- os.unlink(os.path.join(ACCUMULO_HOME, 'conf', SITE))
+ self.clean_config_file()
def createTable(self, table, splitFile=None):
if splitFile :
http://git-wip-us.apache.org/repos/asf/accumulo/blob/89c99622/test/system/auto/simple/readwrite.py
----------------------------------------------------------------------
diff --cc test/system/auto/simple/readwrite.py
index 895daf5,13d2afa..d252677
--- a/test/system/auto/simple/readwrite.py
+++ b/test/system/auto/simple/readwrite.py
@@@ -20,7 -20,7 +20,7 @@@ import unittes
import time
import sys
- from TestUtils import TestUtilsMixin, FUZZ, ACCUMULO_HOME, SITE,
INSTANCE_NAME, ROOT, ROOT_PASSWORD
-from TestUtils import TestUtilsMixin, FUZZ, SITE_PATH
++from TestUtils import TestUtilsMixin, FUZZ, SITE_PATH, INSTANCE_NAME, ROOT,
ROOT_PASSWORD
log = logging.getLogger('test.auto')
http://git-wip-us.apache.org/repos/asf/accumulo/blob/89c99622/test/system/auto/simple/zooCacheTest.py
----------------------------------------------------------------------
