Repository: hive Updated Branches: refs/heads/master 0a24c8859 -> e1e68b29a
Revert "HIVE-13511. Run clidriver tests from within the qtest dir for the precommit tests. (Siddharth Seth, reviewed by Ashutosh Chauhan)" This reverts commit 02b2fb5a991b3dada90b442dbb013d466c3a50b0. Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/9906cd2b Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/9906cd2b Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/9906cd2b Branch: refs/heads/master Commit: 9906cd2ba9884c5c08b21e40b2db640a07bd80ad Parents: 0a24c88 Author: Sergio Pena <[email protected]> Authored: Sat May 28 08:34:20 2016 -0500 Committer: Sergio Pena <[email protected]> Committed: Sat May 28 08:34:20 2016 -0500 ---------------------------------------------------------------------- .../hive/ptest/execution/HostExecutor.java | 4 ---- .../org/apache/hive/ptest/execution/PTest.java | 1 - .../ptest/execution/conf/QFileTestBatch.java | 12 ++---------- .../hive/ptest/execution/conf/TestBatch.java | 1 - .../hive/ptest/execution/conf/TestParser.java | 20 +++----------------- .../ptest/execution/conf/UnitTestBatch.java | 6 ------ .../ptest/execution/TestExecutionPhase.java | 4 +--- .../execution/conf/TestQFileTestBatch.java | 12 +++--------- 8 files changed, 9 insertions(+), 51 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/9906cd2b/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/HostExecutor.java ---------------------------------------------------------------------- diff --git a/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/HostExecutor.java b/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/HostExecutor.java index 2c9100e..735b261 100644 --- a/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/HostExecutor.java +++ b/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/HostExecutor.java @@ -40,7 +40,6 @@ import org.apache.hive.ptest.execution.ssh.SSHCommand; import org.apache.hive.ptest.execution.ssh.SSHCommandExecutor; import org.apache.hive.ptest.execution.ssh.SSHExecutionException; import org.apache.hive.ptest.execution.ssh.SSHResult; -import org.apache.logging.log4j.util.Strings; import org.slf4j.Logger; import com.google.common.annotations.VisibleForTesting; @@ -244,9 +243,6 @@ class HostExecutor { templateVariables.put("testArguments", batch.getTestArguments()); templateVariables.put("localDir", drone.getLocalDirectory()); templateVariables.put("logDir", drone.getLocalLogDirectory()); - if (!Strings.isEmpty(batch.getTestModule())) { - templateVariables.put("testModule", batch.getTestModule()); - } String command = Templates.getTemplateResult("bash $localDir/$instanceName/scratch/" + script.getName(), templateVariables); Templates.writeTemplateResult("batch-exec.vm", script, templateVariables); http://git-wip-us.apache.org/repos/asf/hive/blob/9906cd2b/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/PTest.java ---------------------------------------------------------------------- diff --git a/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/PTest.java b/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/PTest.java index de5c322..35cc752 100644 --- a/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/PTest.java +++ b/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/PTest.java @@ -164,7 +164,6 @@ public class PTest { Map<String, Long> elapsedTimes = Maps.newTreeMap(); try { mLogger.info("Running tests with " + mConfiguration); - mLogger.info("Running tests with configuration context=[{}]", mConfiguration.getContext()); for(Phase phase : mPhases) { String msg = "Executing " + phase.getClass().getName(); mLogger.info(msg); http://git-wip-us.apache.org/repos/asf/hive/blob/9906cd2b/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/QFileTestBatch.java ---------------------------------------------------------------------- diff --git a/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/QFileTestBatch.java b/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/QFileTestBatch.java index fa213db..61ecc88 100644 --- a/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/QFileTestBatch.java +++ b/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/QFileTestBatch.java @@ -29,11 +29,10 @@ public class QFileTestBatch implements TestBatch { private final String driver; private final String queryFilesProperty; private final String name; - private final String moduleName; private final Set<String> tests; private final boolean isParallel; public QFileTestBatch(String testCasePropertyName, String driver, - String queryFilesProperty, Set<String> tests, boolean isParallel, String moduleName) { + String queryFilesProperty, Set<String> tests, boolean isParallel) { this.testCasePropertyName = testCasePropertyName; this.driver = driver; this.queryFilesProperty = queryFilesProperty; @@ -45,7 +44,6 @@ public class QFileTestBatch implements TestBatch { } this.name = name; this.isParallel = isParallel; - this.moduleName = moduleName; } public String getDriver() { return driver; @@ -68,18 +66,12 @@ public class QFileTestBatch implements TestBatch { public String toString() { return "QFileTestBatch [driver=" + driver + ", queryFilesProperty=" + queryFilesProperty + ", name=" + name + ", tests=" + tests - + ", isParallel=" + isParallel + ", moduleName=" + moduleName + "]"; + + ", isParallel=" + isParallel + "]"; } @Override public boolean isParallel() { return isParallel; } - - @Override - public String getTestModule() { - return moduleName; - } - @Override public int hashCode() { final int prime = 31; http://git-wip-us.apache.org/repos/asf/hive/blob/9906cd2b/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestBatch.java ---------------------------------------------------------------------- diff --git a/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestBatch.java b/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestBatch.java index 4ebb670..fc5a7c5 100644 --- a/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestBatch.java +++ b/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestBatch.java @@ -28,5 +28,4 @@ public interface TestBatch { public boolean isParallel(); - public String getTestModule(); } http://git-wip-us.apache.org/repos/asf/hive/blob/9906cd2b/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestParser.java ---------------------------------------------------------------------- diff --git a/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestParser.java b/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestParser.java index 6d100de..aef6ac1 100644 --- a/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestParser.java +++ b/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestParser.java @@ -50,9 +50,6 @@ public class TestParser { private static final Splitter TEST_SPLITTER = Splitter.onPattern("[, ]") .trimResults().omitEmptyStrings(); - private static final String QTEST_MODULE_NAME = "qtest"; - private static final String QTEST_SPARK_MODULE_NAME = "qtest-spark"; - private final Context context; private final String testCasePropertyName; private final File sourceDirectory; @@ -180,20 +177,17 @@ public class TestParser { logger.info("Exlcuding test " + driver + " " + test); } else if(isolated.contains(test)) { logger.info("Executing isolated test " + driver + " " + test); - testBatches.add(new QFileTestBatch(testCasePropertyName, driver, queryFilesProperty, - Sets.newHashSet(test), isParallel, getModuleName(driver))); + testBatches.add(new QFileTestBatch(testCasePropertyName, driver, queryFilesProperty, Sets.newHashSet(test), isParallel)); } else { if(testBatch.size() >= batchSize) { - testBatches.add(new QFileTestBatch(testCasePropertyName, driver, queryFilesProperty, - Sets.newHashSet(testBatch), isParallel, getModuleName(driver))); + testBatches.add(new QFileTestBatch(testCasePropertyName, driver, queryFilesProperty, Sets.newHashSet(testBatch), isParallel)); testBatch = Lists.newArrayList(); } testBatch.add(test); } } if(!testBatch.isEmpty()) { - testBatches.add(new QFileTestBatch(testCasePropertyName, driver, queryFilesProperty, - Sets.newHashSet(testBatch), isParallel, getModuleName(driver))); + testBatches.add(new QFileTestBatch(testCasePropertyName, driver, queryFilesProperty, Sets.newHashSet(testBatch), isParallel)); } return testBatches; } @@ -265,14 +259,6 @@ public class TestParser { tests.addAll(toAdd); } - private String getModuleName(String driverName) { - if (driverName.toLowerCase().contains("spark")) { - return QTEST_SPARK_MODULE_NAME; - } else { - return QTEST_MODULE_NAME; - } - } - public Supplier<List<TestBatch>> parse() { return new Supplier<List<TestBatch>>() { @Override http://git-wip-us.apache.org/repos/asf/hive/blob/9906cd2b/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/UnitTestBatch.java ---------------------------------------------------------------------- diff --git a/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/UnitTestBatch.java b/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/UnitTestBatch.java index 51f7f90..ca1adec 100644 --- a/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/UnitTestBatch.java +++ b/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/UnitTestBatch.java @@ -51,12 +51,6 @@ public class UnitTestBatch implements TestBatch { public boolean isParallel() { return isParallel; } - - @Override - public String getTestModule() { - return null; - } - @Override public int hashCode() { final int prime = 31; http://git-wip-us.apache.org/repos/asf/hive/blob/9906cd2b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestExecutionPhase.java ---------------------------------------------------------------------- diff --git a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestExecutionPhase.java b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestExecutionPhase.java index 29d148b..09f237e 100644 --- a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestExecutionPhase.java +++ b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestExecutionPhase.java @@ -69,9 +69,7 @@ public class TestExecutionPhase extends AbstractTestPhase { private void setupQFile(boolean isParallel) throws Exception { testDir = Dirs.create( new File(baseDir, "test")); Assert.assertTrue(new File(testDir, QFILENAME).createNewFile()); - testBatch = - new QFileTestBatch("testcase", DRIVER, "qfile", Sets.newHashSet(QFILENAME), isParallel, - "testModule"); + testBatch = new QFileTestBatch("testcase", DRIVER, "qfile", Sets.newHashSet(QFILENAME), isParallel); testBatches = Collections.singletonList(testBatch); } private void setupUnitTest() throws Exception { http://git-wip-us.apache.org/repos/asf/hive/blob/9906cd2b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/conf/TestQFileTestBatch.java ---------------------------------------------------------------------- diff --git a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/conf/TestQFileTestBatch.java b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/conf/TestQFileTestBatch.java index 0257591..67349fc 100644 --- a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/conf/TestQFileTestBatch.java +++ b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/conf/TestQFileTestBatch.java @@ -32,7 +32,6 @@ public class TestQFileTestBatch { private static final String DRIVER = "driver"; private static final String QUERY_FILES_PROPERTY = "qfile"; - private static final String TEST_MODULE_NAME = "testModule"; private Set<String> tests; @@ -43,28 +42,23 @@ public class TestQFileTestBatch { @Test public void testParallel() throws Exception { - QFileTestBatch batch = - new QFileTestBatch("testcase", DRIVER, QUERY_FILES_PROPERTY, tests, true, TEST_MODULE_NAME); + QFileTestBatch batch = new QFileTestBatch("testcase", DRIVER, QUERY_FILES_PROPERTY, tests, true); Assert.assertTrue(batch.isParallel()); Assert.assertEquals(DRIVER, batch.getDriver()); Assert.assertEquals(Joiner.on("-").join(DRIVER, "a", "b", "c"), batch.getName()); Assert.assertEquals(String.format("-Dtestcase=%s -D%s=a,b,c", DRIVER, QUERY_FILES_PROPERTY), batch.getTestArguments()); - Assert.assertEquals(TEST_MODULE_NAME, batch.getTestModule()); } @Test public void testMoreThanThreeTests() throws Exception { Assert.assertTrue(tests.add("d")); - QFileTestBatch batch = - new QFileTestBatch("testcase", DRIVER, QUERY_FILES_PROPERTY, tests, true, TEST_MODULE_NAME); + QFileTestBatch batch = new QFileTestBatch("testcase", DRIVER, QUERY_FILES_PROPERTY, tests, true); Assert.assertEquals(Joiner.on("-").join(DRIVER, "a", "b", "c", "and", "1", "more"), batch.getName()); } @Test public void testNotParallel() throws Exception { - QFileTestBatch batch = - new QFileTestBatch("testcase", DRIVER, QUERY_FILES_PROPERTY, tests, false, - TEST_MODULE_NAME); + QFileTestBatch batch = new QFileTestBatch("testcase", DRIVER, QUERY_FILES_PROPERTY, tests, false); Assert.assertFalse(batch.isParallel()); } }
