Michael Blow has submitted this change and it was merged. Change subject: [NO ISSUE] Remove unused managix test, props cleanup ......................................................................
[NO ISSUE] Remove unused managix test, props cleanup Change-Id: If463ee396e85af60490676c5b295fe835ba4b1cf Reviewed-on: https://asterix-gerrit.ics.uci.edu/2272 Sonar-Qube: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> Integration-Tests: Jenkins <[email protected]> Contrib: Jenkins <[email protected]> Reviewed-by: Murtadha Hubail <[email protected]> --- M asterixdb/asterix-server/pom.xml D asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/DmlRecoveryIT.java 2 files changed, 0 insertions(+), 158 deletions(-) Approvals: Anon. E. Moose #1000171: Jenkins: Verified; No violations found; ; Verified Murtadha Hubail: Looks good to me, approved diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml index 72c84e4..91ca7ce 100644 --- a/asterixdb/asterix-server/pom.xml +++ b/asterixdb/asterix-server/pom.xml @@ -23,10 +23,6 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <appendedResourcesDirectory>${basedir}/src/main/appended-resources</appendedResourcesDirectory> - <failsafe.test.excludes>**/DmlRecoveryIT.java</failsafe.test.excludes> - <cluster.test.excludes>**/AsterixClusterLifeCycleIT.java</cluster.test.excludes> - <cluster.extest.excludes>**/ClusterExecutionIT.java</cluster.extest.excludes> <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory> </properties> @@ -338,27 +334,6 @@ </goals> </execution> </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <configuration> - <excludes combine.children="append"> - <exclude>${failsafe.test.excludes}</exclude> - <exclude>${cluster.test.excludes}</exclude> - <exclude>${cluster.extest.excludes}</exclude> - </excludes> - <executions> - <execution> - <id>run-tests</id> - <phase>integration-test</phase> - <goals> - <goal>integration-test</goal> - <goal>verify</goal> - </goals> - </execution> - </executions> - </configuration> </plugin> <plugin> <artifactId>maven-assembly-plugin</artifactId> diff --git a/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/DmlRecoveryIT.java b/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/DmlRecoveryIT.java deleted file mode 100644 index bac49b2..0000000 --- a/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/DmlRecoveryIT.java +++ /dev/null @@ -1,133 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.asterix.server.test; - -import java.io.File; -import java.io.FilenameFilter; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Map; - -import org.apache.asterix.test.base.RetainLogsRule; -import org.apache.asterix.test.common.TestExecutor; -import org.apache.asterix.testframework.context.TestCaseContext; -import org.apache.commons.io.FileUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TestRule; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; - -@RunWith(Parameterized.class) -public class DmlRecoveryIT { - - // variable to indicate whether this test will be executed - - private static final Logger LOGGER = LogManager.getLogger(); - private static final String PATH_ACTUAL = "target" + File.separator + "rttest" + File.separator; - - private static final String TESTSUITE_PATH_BASE = "../asterix-app/src/test/resources/runtimets/"; - - private TestCaseContext tcCtx; - private static File asterixInstallerPath; - private static File installerTargetPath; - private static String managixHomeDirName; - private static String managixHomePath; - private static String scriptHomePath; - private static String reportPath; - private static ProcessBuilder pb; - private static Map<String, String> env; - private final TestExecutor testExecutor = new TestExecutor(); - - @Rule - public TestRule retainLogs = new RetainLogsRule(managixHomePath, reportPath, this); - - @BeforeClass - public static void setUp() throws Exception { - File outdir = new File(PATH_ACTUAL); - outdir.mkdirs(); - - asterixInstallerPath = new File(System.getProperty("user.dir")); - installerTargetPath = new File(asterixInstallerPath, "target"); - reportPath = new File(installerTargetPath, "failsafe-reports").getAbsolutePath(); - managixHomeDirName = installerTargetPath.list(new FilenameFilter() { - @Override - public boolean accept(File dir, String name) { - return new File(dir, name).isDirectory() && name.startsWith("asterix-installer") - && name.endsWith("binary-assembly"); - } - })[0]; - managixHomePath = new File(installerTargetPath, managixHomeDirName).getAbsolutePath(); - LOGGER.info("MANAGIX_HOME=" + managixHomePath); - - pb = new ProcessBuilder(); - env = pb.environment(); - env.put("MANAGIX_HOME", managixHomePath); - scriptHomePath = asterixInstallerPath + File.separator + "src" + File.separator + "test" + File.separator - + "resources" + File.separator + "transactionts" + File.separator + "scripts"; - env.put("SCRIPT_HOME", scriptHomePath); - - TestExecutor.executeScript(pb, - scriptHomePath + File.separator + "dml_recovery" + File.separator + "configure_and_validate.sh"); - TestExecutor.executeScript(pb, - scriptHomePath + File.separator + "dml_recovery" + File.separator + "stop_and_delete.sh"); - - TestExecutor.executeScript(pb, - scriptHomePath + File.separator + "dml_recovery" + File.separator + "create_and_start.sh"); - - } - - @AfterClass - public static void tearDown() throws Exception { - File outdir = new File(PATH_ACTUAL); - FileUtils.deleteDirectory(outdir); - TestExecutor.executeScript(pb, - scriptHomePath + File.separator + "dml_recovery" + File.separator + "stop_and_delete.sh"); - TestExecutor.executeScript(pb, - scriptHomePath + File.separator + "dml_recovery" + File.separator + "shutdown.sh"); - - } - - @Parameters - public static Collection<Object[]> tests() throws Exception { - - Collection<Object[]> testArgs = new ArrayList<Object[]>(); - TestCaseContext.Builder b = new TestCaseContext.Builder(); - for (TestCaseContext ctx : b.build(new File(TESTSUITE_PATH_BASE))) { - if (ctx.getTestCase().getFilePath().equals("dml")) { - testArgs.add(new Object[] { ctx }); - } - } - return testArgs; - } - - public DmlRecoveryIT(TestCaseContext tcCtx) { - this.tcCtx = tcCtx; - } - - @Test - public void test() throws Exception { - testExecutor.executeTest(PATH_ACTUAL, tcCtx, pb, true); - } -} -- To view, visit https://asterix-gerrit.ics.uci.edu/2272 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: If463ee396e85af60490676c5b295fe835ba4b1cf Gerrit-PatchSet: 3 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow <[email protected]> Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Ian Maxon <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Michael Blow <[email protected]> Gerrit-Reviewer: Murtadha Hubail <[email protected]> Gerrit-Reviewer: Till Westmann <[email protected]>
