From 3b317f6f184d1af042ff8e88854df3c38cd764a3 Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Mon, 10 Jun 2013 19:32:13 +0000 Subject: [PATCH] HBASE-8637 IntegrationTestBigLinkedListWithChaosMonkey uses the wrong table name git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1491573 13f79535-47bb-0310-9956-ffa450edef68 --- .../IntegrationTestBigLinkedListWithChaosMonkey.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedListWithChaosMonkey.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedListWithChaosMonkey.java index 5c37f53ef43..ad397b932f9 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedListWithChaosMonkey.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedListWithChaosMonkey.java @@ -21,6 +21,7 @@ package org.apache.hadoop.hbase.test; import java.io.IOException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.IntegrationTestingUtility; import org.apache.hadoop.hbase.IntegrationTests; import org.apache.hadoop.hbase.util.ChaosMonkey; @@ -44,8 +45,13 @@ public class IntegrationTestBigLinkedListWithChaosMonkey extends IntegrationTest public IntegrationTestBigLinkedListWithChaosMonkey() { super(); - TABLE_NAME_KEY = "IntegrationTestBigLinkedListWithChaosMonkey.table"; - DEFAULT_TABLE_NAME = "IntegrationTestBigLinkedListWithChaosMonkey"; + Configuration conf = getConf(); + if (conf != null) { + conf.set(TABLE_NAME_KEY, "IntegrationTestBigLinkedListWithChaosMonkey"); + } else { + this.getTestingUtil().getConfiguration() + .set(TABLE_NAME_KEY, "IntegrationTestBigLinkedListWithChaosMonkey"); + } } @Before @@ -90,7 +96,7 @@ public class IntegrationTestBigLinkedListWithChaosMonkey extends IntegrationTest test.setUp(); // run the test - int ret = ToolRunner.run(test.getConf(), test, args); + int ret = ToolRunner.run(test.getTestingUtil().getConfiguration(), test, args); test.tearDown(); System.exit(ret);