Repository: incubator-slider Updated Branches: refs/heads/develop f91c09122 -> b948f8b2e
SLIDER-531 turn off two tests that won't build against branch-2 Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/b948f8b2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/b948f8b2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/b948f8b2 Branch: refs/heads/develop Commit: b948f8b2e30be949d729173cdd49f81c829b2a17 Parents: f91c091 Author: Steve Loughran <[email protected]> Authored: Sun Nov 2 22:04:07 2014 +0000 Committer: Steve Loughran <[email protected]> Committed: Sun Nov 2 22:04:07 2014 +0000 ---------------------------------------------------------------------- .../appmaster/web/rest/registry/TestRegistryRestMarshalling.groovy | 2 ++ .../appmaster/web/rest/registry/TestRegistryRestResources.groovy | 2 ++ 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b948f8b2/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/registry/TestRegistryRestMarshalling.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/registry/TestRegistryRestMarshalling.groovy b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/registry/TestRegistryRestMarshalling.groovy index 53dda35..2a25012 100644 --- a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/registry/TestRegistryRestMarshalling.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/registry/TestRegistryRestMarshalling.groovy @@ -20,6 +20,7 @@ package org.apache.slider.server.appmaster.web.rest.registry import groovy.transform.CompileStatic import org.apache.hadoop.registry.client.types.yarn.YarnRegistryAttributes +import org.junit.Ignore import org.junit.Test /** @@ -33,6 +34,7 @@ import org.junit.Test class TestRegistryRestMarshalling { @Test + @Ignore("SLIDER-531") public void testDeser() throws Throwable { PathEntryMarshalling pem = new PathEntryMarshalling(); def unmarshalled = pem.fromResource( http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/b948f8b2/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/registry/TestRegistryRestResources.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/registry/TestRegistryRestResources.groovy b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/registry/TestRegistryRestResources.groovy index 43d109d..b65c57e 100644 --- a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/registry/TestRegistryRestResources.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/registry/TestRegistryRestResources.groovy @@ -33,6 +33,7 @@ import org.apache.slider.common.SliderKeys import org.apache.slider.core.main.ServiceLauncher import org.apache.slider.providers.agent.AgentTestBase import org.apache.slider.server.appmaster.web.rest.RestPaths +import org.junit.Ignore import org.junit.Test import javax.ws.rs.core.MediaType @@ -52,6 +53,7 @@ class TestRegistryRestResources extends AgentTestBase { @Test + @Ignore("SLIDER-531") public void testRestURIs() throws Throwable { def clustername = CLUSTERNAME
