Repository: incubator-slider Updated Branches: refs/heads/feature/SLIDER-82-pass-3.1 57638ff4e -> 4cc0d0dbd
SLIDER-970: preamble âreview and clean up existing functional tests, extracting resources to new file of constants, ResourcePaths.groovy Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/f36c0dad Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/f36c0dad Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/f36c0dad Branch: refs/heads/feature/SLIDER-82-pass-3.1 Commit: f36c0dade1f8b6eb7547704f411f8a9811d4191f Parents: 57638ff Author: Steve Loughran <[email protected]> Authored: Wed Nov 18 14:24:14 2015 +0000 Committer: Steve Loughran <[email protected]> Committed: Wed Nov 18 14:24:14 2015 +0000 ---------------------------------------------------------------------- .../slider/client/SliderYarnClientImpl.java | 2 +- .../appstate/TestMockAppStateAAPlacement.groovy | 5 +-- .../apache/slider/funtest/ResourcePaths.groovy | 37 ++++++++++++++++ .../funtest/basic/ClusterConnectivityIT.groovy | 9 ++-- ...nentConfigsInAppConfigShowUpOnAgentIT.groovy | 3 -- .../slider/funtest/basic/SyspropsIT.groovy | 3 +- .../funtest/commands/CommandExitCodesIT.groovy | 1 - .../funtest/commands/ListCommandIT.groovy | 1 - .../funtest/commands/SimpleCommandsIT.groovy | 2 - .../AMClientCertStoreRetrievalIT.groovy | 27 ++++++------ .../lifecycle/AgentClientInstallIT.groovy | 7 --- .../lifecycle/AgentClusterLifecycleIT.groovy | 3 +- .../funtest/lifecycle/AgentFailures2IT.groovy | 4 +- .../funtest/lifecycle/AgentFailuresIT.groovy | 4 +- .../AgentLaunchFailureIT_Disabled.groovy | 3 +- .../funtest/lifecycle/AgentMinSleepIT.groovy | 8 ---- .../funtest/lifecycle/AgentPingSocketIT.groovy | 17 +++----- .../funtest/lifecycle/AgentRegistryIT.groovy | 4 +- .../lifecycle/AppsThroughAgentDemo.groovy | 45 -------------------- .../funtest/lifecycle/AppsThroughAgentIT.groovy | 3 +- .../AppsThroughAgentQueueAndLabelsIT.groovy | 4 +- .../funtest/lifecycle/AppsUpgradeIT.groovy | 4 +- .../lifecycle/ClusterBuildDestroyIT.groovy | 3 -- .../lifecycle/DemoAppsThroughAgent.groovy | 45 ++++++++++++++++++++ 24 files changed, 123 insertions(+), 121 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f36c0dad/slider-core/src/main/java/org/apache/slider/client/SliderYarnClientImpl.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/client/SliderYarnClientImpl.java b/slider-core/src/main/java/org/apache/slider/client/SliderYarnClientImpl.java index 867603b..a315345 100644 --- a/slider-core/src/main/java/org/apache/slider/client/SliderYarnClientImpl.java +++ b/slider-core/src/main/java/org/apache/slider/client/SliderYarnClientImpl.java @@ -138,7 +138,7 @@ public class SliderYarnClientImpl extends YarnClientImpl { List<ApplicationReport> instances = listDeployedInstances(user); List<ApplicationReport> results = - new ArrayList<ApplicationReport>(instances.size()); + new ArrayList<>(instances.size()); for (ApplicationReport report : instances) { if (report.getName().equals(appname)) { results.add(report); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f36c0dad/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateAAPlacement.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateAAPlacement.groovy b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateAAPlacement.groovy index 4eff059..f911515 100644 --- a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateAAPlacement.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateAAPlacement.groovy @@ -307,8 +307,7 @@ class TestMockAppStateAAPlacement extends BaseMockAppStateAATest def aaRole = lookupRole(MockFactory.AAROLE_2.name) def gpuRole = lookupRole(MockFactory.AAROLE_1_GPU.name) appState.reviewRequestAndReleaseNodes() - assert aaRole.isAntiAffinePlacement() - assert aaRole.isAARequestOutstanding() - + assert aaRole.antiAffinePlacement + assert aaRole.AARequestOutstanding } } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f36c0dad/slider-funtest/src/test/groovy/org/apache/slider/funtest/ResourcePaths.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/ResourcePaths.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/ResourcePaths.groovy new file mode 100644 index 0000000..c93753d --- /dev/null +++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/ResourcePaths.groovy @@ -0,0 +1,37 @@ +/* + * 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.slider.funtest + +/** + * The various resources used for test runs + */ +interface ResourcePaths { + + String SLIDER_CORE_TEST_SRC= "../slider-core/src/test" + String SLIDER_CORE_APP_PACKAGES = "$SLIDER_CORE_TEST_SRC/app_packages" + String COMMAND_LOG_RESOURCES = "$SLIDER_CORE_APP_PACKAGES/test_command_log/resources.json" + String COMMAND_LOG_RESOURCES_QUEUE_LABELS = "$SLIDER_CORE_APP_PACKAGES/test_command_log/resources_queue_labels.json" + String COMMAND_LOG_RESOURCES_NO_ROLE = "$SLIDER_CORE_APP_PACKAGES/test_command_log/resources_no_role.json" + String COMMAND_LOG_APPCONFIG_NO_HB = "$SLIDER_CORE_APP_PACKAGES/test_command_log/appConfig_no_hb.json" + String COMMAND_LOG_APPCONFIG_FAST_NO_REG = "$SLIDER_CORE_APP_PACKAGES/test_command_log/appConfig_fast_no_reg.json" + + static String PING_RESOURCES = "$SLIDER_CORE_APP_PACKAGES/test_min_pkg/nc_ping_cmd/resources.json" + static String PING_META = "$SLIDER_CORE_APP_PACKAGES/test_min_pkg/nc_ping_cmd/metainfo.json" + static String PING_APPCONFIG = "$SLIDER_CORE_APP_PACKAGES/test_min_pkg/nc_ping_cmd/appConfig.json" + +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f36c0dad/slider-funtest/src/test/groovy/org/apache/slider/funtest/basic/ClusterConnectivityIT.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/basic/ClusterConnectivityIT.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/basic/ClusterConnectivityIT.groovy index 9826e97..5d069bc 100644 --- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/basic/ClusterConnectivityIT.groovy +++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/basic/ClusterConnectivityIT.groovy @@ -37,7 +37,6 @@ import org.junit.Test */ class ClusterConnectivityIT extends CommandTestBase { - public static final int CONNECT_TIMEOUT = 2000 @Test @@ -60,7 +59,7 @@ class ClusterConnectivityIT extends CommandTestBase { tuples.each { telnet(it.hostText, it.port) } - + } @Test @@ -73,7 +72,7 @@ class ClusterConnectivityIT extends CommandTestBase { telnet(rmAddr.hostName, rmAddr.port) } } - + @Test public void testRMBinding() throws Throwable { SliderYarnClientImpl yarnClient = new SliderYarnClientImpl() @@ -83,10 +82,10 @@ class ClusterConnectivityIT extends CommandTestBase { YarnConfiguration.RESOURCEMANAGER_CONNECT_MAX_WAIT_MS,5000) SLIDER_CONFIG.setInt( YarnConfiguration.RESOURCEMANAGER_CONNECT_RETRY_INTERVAL_MS,50) - + yarnClient.init(SLIDER_CONFIG) yarnClient.start(); - def instances = yarnClient.listInstances("") + def instances = yarnClient.listDeployedInstances("") instances.each {it -> log.info("Instance $it.applicationId")} } finally { yarnClient.stop() http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f36c0dad/slider-funtest/src/test/groovy/org/apache/slider/funtest/basic/ComponentConfigsInAppConfigShowUpOnAgentIT.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/basic/ComponentConfigsInAppConfigShowUpOnAgentIT.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/basic/ComponentConfigsInAppConfigShowUpOnAgentIT.groovy index cf74bbf..91797f9 100644 --- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/basic/ComponentConfigsInAppConfigShowUpOnAgentIT.groovy +++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/basic/ComponentConfigsInAppConfigShowUpOnAgentIT.groovy @@ -23,9 +23,6 @@ import groovy.util.logging.Slf4j import org.apache.slider.common.tools.SliderUtils import org.apache.slider.funtest.framework.AgentCommandTestBase -import org.apache.slider.common.params.SliderActions -import org.apache.slider.client.SliderClient -import org.apache.slider.common.SliderExitCodes import org.apache.slider.funtest.framework.SliderShell import org.junit.After import org.junit.Before http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f36c0dad/slider-funtest/src/test/groovy/org/apache/slider/funtest/basic/SyspropsIT.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/basic/SyspropsIT.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/basic/SyspropsIT.groovy index 728920e..e53c875 100644 --- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/basic/SyspropsIT.groovy +++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/basic/SyspropsIT.groovy @@ -36,11 +36,10 @@ import org.junit.Test @Slf4j class SyspropsIT extends SliderTestUtils{ - @Test public void testDumpSysprops() throws Throwable { def sysprops = System.properties - TreeSet<String> sorted = new TreeSet<String>(); + TreeSet<String> sorted = new TreeSet<>(); sysprops.keys().each { String it -> sorted.add(it)} sorted.each { String key -> log.info("$key=\"${sysprops[key]}\"") http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f36c0dad/slider-funtest/src/test/groovy/org/apache/slider/funtest/commands/CommandExitCodesIT.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/commands/CommandExitCodesIT.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/commands/CommandExitCodesIT.groovy index 73912e6..666342e 100644 --- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/commands/CommandExitCodesIT.groovy +++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/commands/CommandExitCodesIT.groovy @@ -20,7 +20,6 @@ package org.apache.slider.funtest.commands import groovy.transform.CompileStatic import groovy.util.logging.Slf4j -import org.apache.slider.common.SliderExitCodes import org.apache.slider.core.main.LauncherExitCodes import org.apache.slider.funtest.framework.CommandTestBase import org.junit.Test http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f36c0dad/slider-funtest/src/test/groovy/org/apache/slider/funtest/commands/ListCommandIT.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/commands/ListCommandIT.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/commands/ListCommandIT.groovy index 916117c..b378110 100644 --- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/commands/ListCommandIT.groovy +++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/commands/ListCommandIT.groovy @@ -22,7 +22,6 @@ import groovy.transform.CompileStatic import groovy.util.logging.Slf4j import org.apache.slider.core.main.LauncherExitCodes import org.apache.slider.funtest.framework.CommandTestBase -import org.junit.BeforeClass import org.junit.Test @CompileStatic http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f36c0dad/slider-funtest/src/test/groovy/org/apache/slider/funtest/commands/SimpleCommandsIT.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/commands/SimpleCommandsIT.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/commands/SimpleCommandsIT.groovy index 75d0634..e22c5f2 100644 --- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/commands/SimpleCommandsIT.groovy +++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/commands/SimpleCommandsIT.groovy @@ -20,9 +20,7 @@ package org.apache.slider.funtest.commands import groovy.transform.CompileStatic import groovy.util.logging.Slf4j -import org.apache.bigtop.itest.shell.Shell import org.apache.slider.funtest.framework.CommandTestBase -import org.apache.slider.funtest.framework.SliderShell import org.apache.slider.common.params.SliderActions import org.junit.Test http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f36c0dad/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AMClientCertStoreRetrievalIT.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AMClientCertStoreRetrievalIT.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AMClientCertStoreRetrievalIT.groovy index 950dc68..05adebd 100644 --- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AMClientCertStoreRetrievalIT.groovy +++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AMClientCertStoreRetrievalIT.groovy @@ -33,7 +33,6 @@ import org.apache.slider.funtest.framework.AgentCommandTestBase import org.apache.slider.funtest.framework.FuntestProperties import org.apache.slider.funtest.framework.SliderShell import org.junit.After -import org.junit.Assert import org.junit.Test import javax.net.ssl.TrustManager @@ -47,7 +46,6 @@ import java.security.cert.Certificate import java.security.cert.CertificateException import java.security.cert.X509Certificate import com.google.common.io.Files -import java.io.File @CompileStatic @Slf4j @@ -107,7 +105,8 @@ implements FuntestProperties, Arguments, SliderExitCodes, SliderActions { String password = "welcome"; // ensure file doesn't exist - new File(filename).delete(); + def keystoreFile = new File(filename) + keystoreFile.delete(); shell = slider(EXIT_SUCCESS, [ @@ -118,7 +117,7 @@ implements FuntestProperties, Arguments, SliderExitCodes, SliderActions { ARG_PASSWORD, password ]) - assert new File(filename).exists() + assert keystoreFile.exists() KeyStore keystore = loadKeystoreFromFile(filename, password.toCharArray()) @@ -126,7 +125,7 @@ implements FuntestProperties, Arguments, SliderExitCodes, SliderActions { filename = myTempDir.canonicalPath + File.separator + "test.truststore" // ensure file doesn't exist - new File(filename).delete(); + keystoreFile.delete(); shell = slider(EXIT_SUCCESS, [ @@ -137,7 +136,7 @@ implements FuntestProperties, Arguments, SliderExitCodes, SliderActions { ARG_PASSWORD, password ]) - assert new File(filename).exists() + assert keystoreFile.exists() KeyStore truststore = loadKeystoreFromFile(filename, password.toCharArray()) @@ -164,7 +163,7 @@ implements FuntestProperties, Arguments, SliderExitCodes, SliderActions { log.info("Created credential provider $providerString for test") // ensure file doesn't exist - new File(filename).delete(); + keystoreFile.delete(); shell = slider(EXIT_SUCCESS, [ @@ -176,7 +175,7 @@ implements FuntestProperties, Arguments, SliderExitCodes, SliderActions { ARG_PROVIDER, providerString ]) - assert new File(filename).exists() + assert keystoreFile.exists() keystore = loadKeystoreFromFile(filename, password.toCharArray()) @@ -184,7 +183,7 @@ implements FuntestProperties, Arguments, SliderExitCodes, SliderActions { filename = myTempDir.canonicalPath + File.separator + "test.truststore" // ensure file doesn't exist - new File(filename).delete(); + keystoreFile.delete(); shell = slider(EXIT_SUCCESS, [ @@ -196,7 +195,7 @@ implements FuntestProperties, Arguments, SliderExitCodes, SliderActions { ARG_PROVIDER, providerString ]) - assert new File(filename).exists() + assert keystoreFile.exists() truststore = loadKeystoreFromFile(filename, password.toCharArray()) @@ -207,7 +206,7 @@ implements FuntestProperties, Arguments, SliderExitCodes, SliderActions { private static void validateKeystore(KeyStore keystore) { Certificate certificate = keystore.getCertificate( keystore.aliases().nextElement()); - Assert.assertNotNull(certificate); + assert certificate String hostname = InetAddress.localHost.canonicalHostName; @@ -217,9 +216,7 @@ implements FuntestProperties, Arguments, SliderExitCodes, SliderActions { // Get subject Principal principal = x509cert.getSubjectDN(); String subjectDn = principal.getName(); - Assert.assertEquals("wrong DN", - "CN=" + hostname + ", OU=" + APPLICATION_NAME + ", OU=client", - subjectDn); + assert subjectDn == "CN=" + hostname + ", OU=" + APPLICATION_NAME + ", OU=client" } } @@ -229,7 +226,7 @@ implements FuntestProperties, Arguments, SliderExitCodes, SliderActions { // obtain server cert Certificate certificate = keystore.getCertificate( keystore.aliases().nextElement()); - Assert.assertNotNull(certificate); + assert certificate // validate keystore cert using trust store TrustManagerFactory trustManagerFactory = http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f36c0dad/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentClientInstallIT.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentClientInstallIT.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentClientInstallIT.groovy index deb2d97..6d1f759 100644 --- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentClientInstallIT.groovy +++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentClientInstallIT.groovy @@ -21,19 +21,12 @@ package org.apache.slider.funtest.lifecycle import groovy.io.FileType import groovy.transform.CompileStatic import groovy.util.logging.Slf4j -import org.apache.hadoop.yarn.api.records.YarnApplicationState -import org.apache.slider.api.ClusterDescription -import org.apache.slider.api.StatusKeys -import org.apache.slider.client.SliderClient import org.apache.slider.common.SliderExitCodes -import org.apache.slider.common.SliderXmlConfKeys import org.apache.slider.common.params.Arguments import org.apache.slider.common.params.SliderActions import org.apache.slider.funtest.framework.AgentCommandTestBase import org.apache.slider.funtest.framework.FuntestProperties import org.apache.slider.funtest.framework.SliderShell -import org.junit.After -import org.junit.Before import org.junit.Test @CompileStatic http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f36c0dad/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentClusterLifecycleIT.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentClusterLifecycleIT.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentClusterLifecycleIT.groovy index ca9f71b..faeb0a1 100644 --- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentClusterLifecycleIT.groovy +++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentClusterLifecycleIT.groovy @@ -28,6 +28,7 @@ import org.apache.slider.common.SliderExitCodes import org.apache.slider.common.SliderXmlConfKeys import org.apache.slider.common.params.Arguments import org.apache.slider.common.params.SliderActions +import org.apache.slider.funtest.ResourcePaths import org.apache.slider.funtest.framework.AgentCommandTestBase import org.apache.slider.funtest.framework.FuntestProperties import org.apache.slider.funtest.framework.SliderShell @@ -43,7 +44,7 @@ public class AgentClusterLifecycleIT extends AgentCommandTestBase static String CLUSTER = "test-agent-cluster-lifecycle" - static String APP_RESOURCE2 = "../slider-core/src/test/app_packages/test_command_log/resources_no_role.json" + static String APP_RESOURCE2 = ResourcePaths.COMMAND_LOG_RESOURCES_NO_ROLE @Before http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f36c0dad/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentFailures2IT.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentFailures2IT.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentFailures2IT.groovy index 39b5d6c..d73eb76 100644 --- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentFailures2IT.groovy +++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentFailures2IT.groovy @@ -23,6 +23,7 @@ import groovy.util.logging.Slf4j import org.apache.slider.common.SliderExitCodes import org.apache.slider.common.params.Arguments import org.apache.slider.common.params.SliderActions +import org.apache.slider.funtest.ResourcePaths import org.apache.slider.funtest.framework.AgentCommandTestBase import org.apache.slider.funtest.framework.FuntestProperties import org.apache.slider.funtest.framework.SliderShell @@ -36,8 +37,7 @@ implements FuntestProperties, Arguments, SliderExitCodes, SliderActions { private static String COMMAND_LOGGER = "COMMAND_LOGGER" private static String APPLICATION_NAME = "two-container-fail-heartbeat" - private static String APP_TEMPLATE3 = - "../slider-core/src/test/app_packages/test_command_log/appConfig_no_hb.json" + private static String APP_TEMPLATE3 = ResourcePaths.COMMAND_LOG_APPCONFIG_NO_HB @After http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f36c0dad/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentFailuresIT.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentFailuresIT.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentFailuresIT.groovy index 7d1be89..cfdff75 100644 --- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentFailuresIT.groovy +++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentFailuresIT.groovy @@ -23,6 +23,7 @@ import groovy.util.logging.Slf4j import org.apache.slider.common.SliderExitCodes import org.apache.slider.common.params.Arguments import org.apache.slider.common.params.SliderActions +import org.apache.slider.funtest.ResourcePaths import org.apache.slider.funtest.framework.AgentCommandTestBase import org.apache.slider.funtest.framework.FuntestProperties import org.apache.slider.funtest.framework.SliderShell @@ -36,8 +37,7 @@ implements FuntestProperties, Arguments, SliderExitCodes, SliderActions { private static String COMMAND_LOGGER = "COMMAND_LOGGER" private static String APPLICATION_NAME = "one-container-fail-register" - private static String APP_TEMPLATE2 = - "../slider-core/src/test/app_packages/test_command_log/appConfig_fast_no_reg.json" + private static String APP_TEMPLATE2 = ResourcePaths.COMMAND_LOG_APPCONFIG_FAST_NO_REG @After public void destroyCluster() { http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f36c0dad/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentLaunchFailureIT_Disabled.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentLaunchFailureIT_Disabled.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentLaunchFailureIT_Disabled.groovy index 17eaf04..ee22360 100644 --- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentLaunchFailureIT_Disabled.groovy +++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentLaunchFailureIT_Disabled.groovy @@ -21,6 +21,7 @@ package org.apache.slider.funtest.lifecycle import groovy.transform.CompileStatic import groovy.util.logging.Slf4j import org.apache.slider.common.SliderXmlConfKeys +import org.apache.slider.funtest.ResourcePaths import org.apache.slider.server.appmaster.SliderAppMaster import static org.apache.slider.api.InternalKeys.* @@ -41,7 +42,7 @@ public class AgentLaunchFailureIT_Disabled extends AgentCommandTestBase static String CLUSTER = "test-agent-launchfail" - static String APP_RESOURCE2 = "../slider-core/src/test/app_packages/test_command_log/resources_no_role.json" + static String APP_RESOURCE2 = ResourcePaths.COMMAND_LOG_RESOURCES_NO_ROLE @Before public void prepareCluster() { http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f36c0dad/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentMinSleepIT.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentMinSleepIT.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentMinSleepIT.groovy index e7b0454..b69effa 100644 --- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentMinSleepIT.groovy +++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentMinSleepIT.groovy @@ -20,18 +20,10 @@ package org.apache.slider.funtest.lifecycle import groovy.transform.CompileStatic import groovy.util.logging.Slf4j -import org.apache.hadoop.registry.client.binding.RegistryUtils -import org.apache.hadoop.registry.client.types.Endpoint -import org.apache.hadoop.registry.client.types.ServiceRecord import org.apache.hadoop.yarn.api.records.YarnApplicationState import org.apache.slider.common.SliderExitCodes -import org.apache.slider.common.SliderKeys -import org.apache.slider.common.SliderXmlConfKeys import org.apache.slider.common.params.Arguments import org.apache.slider.common.params.SliderActions -import org.apache.slider.test.Outcome - -import static org.apache.slider.core.registry.info.CustomRegistryConstants.* import org.apache.slider.funtest.framework.AgentCommandTestBase import org.apache.slider.funtest.framework.FuntestProperties import org.apache.slider.funtest.framework.SliderShell http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f36c0dad/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentPingSocketIT.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentPingSocketIT.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentPingSocketIT.groovy index ce2ed92..b10e792 100644 --- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentPingSocketIT.groovy +++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentPingSocketIT.groovy @@ -22,18 +22,11 @@ import groovy.transform.CompileStatic import groovy.util.logging.Slf4j import groovy.json.* import org.apache.hadoop.net.NetUtils -import org.apache.hadoop.registry.client.binding.RegistryUtils -import org.apache.hadoop.registry.client.types.Endpoint -import org.apache.hadoop.registry.client.types.ServiceRecord import org.apache.hadoop.yarn.api.records.YarnApplicationState import org.apache.slider.common.SliderExitCodes -import org.apache.slider.common.SliderKeys -import org.apache.slider.common.SliderXmlConfKeys import org.apache.slider.common.params.Arguments import org.apache.slider.common.params.SliderActions -import org.apache.slider.test.Outcome - -import static org.apache.slider.core.registry.info.CustomRegistryConstants.* +import org.apache.slider.funtest.ResourcePaths import org.apache.slider.funtest.framework.AgentCommandTestBase import org.apache.slider.funtest.framework.FuntestProperties import org.apache.slider.funtest.framework.SliderShell @@ -49,9 +42,9 @@ public class AgentPingSocketIT extends AgentCommandTestBase static String CLUSTER = "test-agent-ping-port" - static String APP_RESOURCE12 = "../slider-core/src/test/app_packages/test_min_pkg/nc_ping_cmd/resources.json" - static String APP_META12 = "../slider-core/src/test/app_packages/test_min_pkg/nc_ping_cmd/metainfo.json" - static String APP_TEMPLATE12 = "../slider-core/src/test/app_packages/test_min_pkg/nc_ping_cmd/appConfig.json" + static String APP_RESOURCE12 = ResourcePaths.PING_RESOURCES + static String APP_META12 = ResourcePaths.PING_META + static String APP_TEMPLATE12 = ResourcePaths.PING_APPCONFIG @Before @@ -68,7 +61,7 @@ public class AgentPingSocketIT extends AgentCommandTestBase public void testAgentRegistry() throws Throwable { describe("Create a cluster using metainfo, resources, and appConfig that calls nc to listen on a port") assumeNotWindows() - def clusterpath = buildClusterPath(CLUSTER) + buildClusterPath(CLUSTER) File launchReportFile = createTempJsonFile(); SliderShell shell = createSliderApplicationMinPkg(CLUSTER, http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f36c0dad/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentRegistryIT.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentRegistryIT.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentRegistryIT.groovy index ff5e57e..7a03a05 100644 --- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentRegistryIT.groovy +++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AgentRegistryIT.groovy @@ -28,6 +28,7 @@ import org.apache.slider.common.SliderExitCodes import org.apache.slider.common.SliderKeys import org.apache.slider.common.params.Arguments import org.apache.slider.common.params.SliderActions +import org.apache.slider.funtest.ResourcePaths import org.apache.slider.test.Outcome import static org.apache.slider.core.registry.info.CustomRegistryConstants.* @@ -46,8 +47,7 @@ public class AgentRegistryIT extends AgentCommandTestBase static String CLUSTER = "test-agent-registry" - static String APP_RESOURCE2 = "../slider-core/src/test/app_packages/test_command_log/resources_no_role.json" - + static String APP_RESOURCE2 = ResourcePaths.COMMAND_LOG_RESOURCES_NO_ROLE @Before public void prepareCluster() { http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f36c0dad/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsThroughAgentDemo.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsThroughAgentDemo.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsThroughAgentDemo.groovy deleted file mode 100644 index 3dd7857..0000000 --- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsThroughAgentDemo.groovy +++ /dev/null @@ -1,45 +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.slider.funtest.lifecycle - -import groovy.transform.CompileStatic -import groovy.util.logging.Slf4j -import org.apache.slider.common.SliderExitCodes -import org.apache.slider.common.params.Arguments -import org.apache.slider.common.params.SliderActions -import org.apache.slider.funtest.framework.AgentCommandTestBase -import org.apache.slider.funtest.framework.FuntestProperties -import org.apache.slider.funtest.framework.SliderShell -import org.junit.Before -import org.junit.Test - -/** - * For a quick demo of a slider app; this starts the apps through agent test but - * neglects to tear it down afterwards - */ -@CompileStatic -@Slf4j -public class AppsThroughAgentDemo extends AppsThroughAgentIT { - - @Override - void destroyCluster() { -// super.destroyCluster() - } - -} http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f36c0dad/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsThroughAgentIT.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsThroughAgentIT.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsThroughAgentIT.groovy index 0db775b..060af5d 100644 --- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsThroughAgentIT.groovy +++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsThroughAgentIT.groovy @@ -76,7 +76,8 @@ implements FuntestProperties, Arguments, SliderExitCodes, SliderActions { application, ARG_COMPONENT, COMMAND_LOGGER, - "2"]) + "2" + ]) // sleep till the new instance starts sleep(1000 * 10) http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f36c0dad/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsThroughAgentQueueAndLabelsIT.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsThroughAgentQueueAndLabelsIT.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsThroughAgentQueueAndLabelsIT.groovy index 5758feb..666efff 100644 --- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsThroughAgentQueueAndLabelsIT.groovy +++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsThroughAgentQueueAndLabelsIT.groovy @@ -25,6 +25,7 @@ import org.apache.slider.api.StatusKeys import org.apache.slider.common.SliderExitCodes import org.apache.slider.common.params.Arguments import org.apache.slider.common.params.SliderActions +import org.apache.slider.funtest.ResourcePaths import org.apache.slider.funtest.framework.AgentCommandTestBase import org.apache.slider.funtest.framework.FuntestProperties import org.apache.slider.funtest.framework.SliderShell @@ -67,8 +68,7 @@ implements FuntestProperties, Arguments, SliderExitCodes, SliderActions { private static String COMMAND_LOGGER = "COMMAND_LOGGER" private static String APPLICATION_NAME = "happy-path-with-queue-labels" private static String TARGET_QUEUE = "labeled" - private static String APP_RESOURCE4 = - "../slider-core/src/test/app_packages/test_command_log/resources_queue_labels.json" + private static String APP_RESOURCE4 = ResourcePaths.COMMAND_LOG_RESOURCES_QUEUE_LABELS @After public void destroyCluster() { http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f36c0dad/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsUpgradeIT.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsUpgradeIT.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsUpgradeIT.groovy index 9fc8e6a..fa8b7a5 100644 --- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsUpgradeIT.groovy +++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/AppsUpgradeIT.groovy @@ -25,6 +25,7 @@ import org.apache.slider.api.StatusKeys import org.apache.slider.common.SliderExitCodes import org.apache.slider.common.params.Arguments import org.apache.slider.common.params.SliderActions +import org.apache.slider.funtest.ResourcePaths import org.apache.slider.funtest.framework.AgentCommandTestBase import org.apache.slider.funtest.framework.FuntestProperties import org.apache.slider.funtest.framework.SliderShell @@ -49,8 +50,7 @@ public class AppsUpgradeIT extends AgentCommandTestBase implements FuntestProperties, Arguments, SliderExitCodes, SliderActions { private static String COMMAND_LOGGER = "COMMAND_LOGGER" private static String APPLICATION_NAME = "app-upgrade-happy-path" - private static String APP_RESOURCE = - "../slider-core/src/test/app_packages/test_command_log/resources.json" + private static String APP_RESOURCE = ResourcePaths.COMMAND_LOG_RESOURCES @After public void destroyCluster() { http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f36c0dad/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/ClusterBuildDestroyIT.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/ClusterBuildDestroyIT.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/ClusterBuildDestroyIT.groovy index f03fb63..66bc10b 100644 --- a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/ClusterBuildDestroyIT.groovy +++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/ClusterBuildDestroyIT.groovy @@ -37,13 +37,10 @@ import org.junit.Test public class ClusterBuildDestroyIT extends AgentCommandTestBase implements FuntestProperties, Arguments, SliderExitCodes, SliderActions { - static String CLUSTER = "test-cluster-build-destroy" - @BeforeClass public static void prepareCluster() { - setupCluster(CLUSTER) } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/f36c0dad/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/DemoAppsThroughAgent.groovy ---------------------------------------------------------------------- diff --git a/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/DemoAppsThroughAgent.groovy b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/DemoAppsThroughAgent.groovy new file mode 100644 index 0000000..8ebb3d2 --- /dev/null +++ b/slider-funtest/src/test/groovy/org/apache/slider/funtest/lifecycle/DemoAppsThroughAgent.groovy @@ -0,0 +1,45 @@ +/* + * 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.slider.funtest.lifecycle + +import groovy.transform.CompileStatic +import groovy.util.logging.Slf4j +import org.apache.slider.common.SliderExitCodes +import org.apache.slider.common.params.Arguments +import org.apache.slider.common.params.SliderActions +import org.apache.slider.funtest.framework.AgentCommandTestBase +import org.apache.slider.funtest.framework.FuntestProperties +import org.apache.slider.funtest.framework.SliderShell +import org.junit.Before +import org.junit.Test + +/** + * For a quick demo of a slider app; this starts the apps through agent test but + * neglects to tear it down afterwards + */ +@CompileStatic +@Slf4j +public class DemoAppsThroughAgent extends AppsThroughAgentIT { + + @Override + void destroyCluster() { +// super.destroyCluster() + } + +}
