IGNITE-9363 Jetty tests forget to stop nodes on finished. - Fixes #4609. Signed-off-by: Dmitriy Pavlov <dpav...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e0c034ea Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e0c034ea Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e0c034ea Branch: refs/heads/ignite-9273 Commit: e0c034ea1d7abc6202cdbfa4f7113c7f6a1164d2 Parents: 0a9ede2 Author: Andrey V. Mashenkov <andrey.mashen...@gmail.com> Authored: Thu Aug 23 20:44:39 2018 +0300 Committer: Dmitriy Pavlov <dpav...@apache.org> Committed: Thu Aug 23 20:44:39 2018 +0300 ---------------------------------------------------------------------- .../internal/processors/rest/AbstractRestProcessorSelfTest.java | 2 ++ .../internal/processors/rest/JettyRestProcessorCommonSelfTest.java | 2 ++ 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e0c034ea/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java index 9781152..e5c658c 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java @@ -44,6 +44,7 @@ public abstract class AbstractRestProcessorSelfTest extends GridCommonAbstractTe /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { cleanPersistenceDir(); + startGrids(gridCount()); } @@ -62,6 +63,7 @@ public abstract class AbstractRestProcessorSelfTest extends GridCommonAbstractTe /** {@inheritDoc} */ @Override protected void afterTestsStopped() throws Exception { stopAllGrids(); + cleanPersistenceDir(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/e0c034ea/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorCommonSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorCommonSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorCommonSelfTest.java index 2076d49..1b93284 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorCommonSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorCommonSelfTest.java @@ -56,6 +56,8 @@ public abstract class JettyRestProcessorCommonSelfTest extends AbstractRestProce /** {@inheritDoc} */ @Override protected void afterTestsStopped() throws Exception { + super.afterTestsStopped(); + System.clearProperty(IGNITE_JETTY_PORT); }
