Repository: ignite Updated Branches: refs/heads/master a0997b99c -> 6f6f8dd3e
IGNITE-7626 Unify code in test which clean up persistence directories - Fixes #3512. Signed-off-by: Alexey Goncharuk <alexey.goncha...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6f6f8dd3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6f6f8dd3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6f6f8dd3 Branch: refs/heads/master Commit: 6f6f8dd3e34272e62aca43e5a756537562c1a505 Parents: a0997b9 Author: EdShangGG <eshangar...@gridgain.com> Authored: Mon Feb 12 21:44:10 2018 +0300 Committer: Alexey Goncharuk <alexey.goncha...@gmail.com> Committed: Mon Feb 12 21:44:10 2018 +0300 ---------------------------------------------------------------------- .../db/checkpoint/IgniteMassLoadSandboxTest.java | 4 ++-- .../file/IgnitePdsCacheDestroyDuringCheckpointTest.java | 11 ++--------- 2 files changed, 4 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6f6f8dd3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/IgniteMassLoadSandboxTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/IgniteMassLoadSandboxTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/IgniteMassLoadSandboxTest.java index b043fa9..316cb8b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/IgniteMassLoadSandboxTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/checkpoint/IgniteMassLoadSandboxTest.java @@ -154,8 +154,8 @@ public class IgniteMassLoadSandboxTest extends GridCommonAbstractTest { @Override protected void beforeTest() throws Exception { stopAllGrids(); - deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), "db", false)); - deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), "temp", false)); + U.delete(U.resolveWorkDirectory(U.defaultWorkDirectory(), "db", false)); + U.delete(U.resolveWorkDirectory(U.defaultWorkDirectory(), "temp", false)); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/6f6f8dd3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCacheDestroyDuringCheckpointTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCacheDestroyDuringCheckpointTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCacheDestroyDuringCheckpointTest.java index 72f73aa..fba62df 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCacheDestroyDuringCheckpointTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCacheDestroyDuringCheckpointTest.java @@ -80,7 +80,7 @@ public class IgnitePdsCacheDestroyDuringCheckpointTest extends GridCommonAbstrac @Override protected void beforeTestsStarted() throws Exception { super.beforeTestsStarted(); - deleteWorkFiles(); + cleanPersistenceDir(); } /** {@inheritDoc} */ @@ -89,7 +89,7 @@ public class IgnitePdsCacheDestroyDuringCheckpointTest extends GridCommonAbstrac stopAllGrids(); - deleteWorkFiles(); + cleanPersistenceDir(); } /** @@ -151,11 +151,4 @@ public class IgnitePdsCacheDestroyDuringCheckpointTest extends GridCommonAbstrac } } } - - /** - * @throws IgniteCheckedException If fail. - */ - private void deleteWorkFiles() throws IgniteCheckedException { - deleteRecursively(U.resolveWorkDirectory(U.defaultWorkDirectory(), DFLT_STORE_DIR, false)); - } } \ No newline at end of file
