Repository: sqoop Updated Branches: refs/heads/sqoop2 82d9f0201 -> 4459bd925
SQOOP-2659. Sqoop2: Do not stop services that haven't been started in our integration test suite (Jarcec via Hari) Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/4459bd92 Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/4459bd92 Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/4459bd92 Branch: refs/heads/sqoop2 Commit: 4459bd925103793663631d75e613e5e32c631cce Parents: 82d9f02 Author: Hari Shreedharan <[email protected]> Authored: Mon Nov 9 14:19:18 2015 -0800 Committer: Hari Shreedharan <[email protected]> Committed: Mon Nov 9 14:19:18 2015 -0800 ---------------------------------------------------------------------- .../apache/sqoop/common/test/kafka/TestUtil.java | 16 +++++++++++----- .../test/testcases/HiveConnectorTestCase.java | 18 ++++++++++++------ 2 files changed, 23 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sqoop/blob/4459bd92/common-test/src/main/java/org/apache/sqoop/common/test/kafka/TestUtil.java ---------------------------------------------------------------------- diff --git a/common-test/src/main/java/org/apache/sqoop/common/test/kafka/TestUtil.java b/common-test/src/main/java/org/apache/sqoop/common/test/kafka/TestUtil.java index f9a3c30..54e2ef4 100644 --- a/common-test/src/main/java/org/apache/sqoop/common/test/kafka/TestUtil.java +++ b/common-test/src/main/java/org/apache/sqoop/common/test/kafka/TestUtil.java @@ -94,8 +94,10 @@ public class TestUtil { // Set kafkaConsumer to null so that a new one is created when // getKafkaConsumer is called. - kafkaConsumer.shutdown(); - kafkaConsumer = null; + if (kafkaConsumer != null) { + kafkaConsumer.shutdown(); + kafkaConsumer = null; + } try { Thread.sleep(3 * 1000); // add this sleep time to @@ -103,9 +105,13 @@ public class TestUtil { } catch (InterruptedException e) { // ignore } - logger.info("Shutting down the kafka Server."); - kafkaServer.stop(); - logger.info("Completed the tearDown phase."); + if (kafkaServer != null) { + logger.info("Shutting down the kafka Server."); + kafkaServer.stop(); + logger.info("Completed the tearDown phase."); + } else { + logger.info("Kafka Server haven't been started, skipping shutdown"); + } } public String getZkUrl() { http://git-wip-us.apache.org/repos/asf/sqoop/blob/4459bd92/test/src/main/java/org/apache/sqoop/test/testcases/HiveConnectorTestCase.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/sqoop/test/testcases/HiveConnectorTestCase.java b/test/src/main/java/org/apache/sqoop/test/testcases/HiveConnectorTestCase.java index 628f484..162adf8 100644 --- a/test/src/main/java/org/apache/sqoop/test/testcases/HiveConnectorTestCase.java +++ b/test/src/main/java/org/apache/sqoop/test/testcases/HiveConnectorTestCase.java @@ -76,13 +76,19 @@ public class HiveConnectorTestCase extends ConnectorTestCase { @AfterMethod(alwaysRun = true) public void stopHive() throws Exception { - LOG.info("Stopping Hive Provider: " + provider.getClass().getName()); - hiveProvider.stop(); + if (hiveProvider != null) { + LOG.info("Stopping Hive Provider: " + provider.getClass().getName()); + hiveProvider.stop(); + } - LOG.info("Stopping Hive Server: " + hiveServerRunner.getClass().getName()); - hiveServerRunner.stop(); + if (hiveServerRunner != null) { + LOG.info("Stopping Hive Server: " + hiveServerRunner.getClass().getName()); + hiveServerRunner.stop(); + } - LOG.info("Stopping Metastore Server: " + metastoreServerRunner.getClass().getName()); - metastoreServerRunner.stop(); + if (metastoreServerRunner != null) { + LOG.info("Stopping Metastore Server: " + metastoreServerRunner.getClass().getName()); + metastoreServerRunner.stop(); + } } }
