Repository: incubator-slider Updated Branches: refs/heads/feature/SLIDER-350-slider-core_tests_failing_on_windows a5df39755 -> b3a835ddc
SLIDER-350 making teardown of failing tests more robust Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/4ff287be Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/4ff287be Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/4ff287be Branch: refs/heads/feature/SLIDER-350-slider-core_tests_failing_on_windows Commit: 4ff287bee75e09dd6c4b119540f8bb26b6760ef5 Parents: a5df397 Author: Steve Loughran <ste...@apache.org> Authored: Fri Aug 22 14:58:37 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Fri Aug 22 14:58:37 2014 +0100 ---------------------------------------------------------------------- .../server/appmaster/web/rest/agent/TestAMAgentWebServices.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4ff287be/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/agent/TestAMAgentWebServices.java ---------------------------------------------------------------------- diff --git a/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/agent/TestAMAgentWebServices.java b/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/agent/TestAMAgentWebServices.java index 8590cbc..827b47a 100644 --- a/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/agent/TestAMAgentWebServices.java +++ b/slider-core/src/test/java/org/apache/slider/server/appmaster/web/rest/agent/TestAMAgentWebServices.java @@ -27,6 +27,7 @@ import com.sun.jersey.api.json.JSONConfiguration; import junit.framework.Assert; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; +import org.apache.hadoop.io.IOUtils; import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.slider.common.SliderKeys; import org.apache.slider.common.tools.SliderUtils; @@ -152,7 +153,7 @@ public class TestAMAgentWebServices { @After public void tearDown () throws Exception { - webApp.close(); + IOUtils.closeStream(webApp); webApp = null; }