IGFS: Reverted back some test changes.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7a71b206 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7a71b206 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7a71b206 Branch: refs/heads/ignite-843 Commit: 7a71b206227452706bbee4e9b64b2294eb39750d Parents: cb7d972 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Tue Sep 15 17:08:16 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Tue Sep 15 17:08:16 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/igfs/IgfsAbstractSelfTest.java | 8 +++++--- .../internal/processors/igfs/IgfsDualAbstractSelfTest.java | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7a71b206/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java index 3e63cdc..0a1e626 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractSelfTest.java @@ -2296,12 +2296,11 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest { * Create the file in the given IGFS and write provided data chunks to it. * * @param file File. - * @param overwrite Overwrite flag. * @param chunks Data chunks. * @throws IOException In case of IO exception. */ - protected static void createFile(UniversalFileSystemAdapter uni, IgfsPath file, boolean overwrite, - @Nullable byte[]... chunks) throws IOException { + protected static void createFile(UniversalFileSystemAdapter uni, IgfsPath file, @Nullable byte[]... chunks) + throws IOException { OutputStream os = null; try { @@ -2689,5 +2688,8 @@ public abstract class IgfsAbstractSelfTest extends IgfsCommonAbstractTest { if (igfsEx != null) clear(igfsEx); + + // Clear the filesystem. + uni.format(); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/7a71b206/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDualAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDualAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDualAbstractSelfTest.java index 9527459..683054b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDualAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDualAbstractSelfTest.java @@ -1129,7 +1129,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest { create(igfsSecondary, paths(DIR, SUBDIR), null); create(igfs, null, null); - createFile(igfsSecondary, FILE, true, chunk); + createFile(igfsSecondary, FILE, chunk); checkFileContent(igfs, FILE, chunk); } @@ -1348,7 +1348,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest { igfsSecondaryFileSystem.update(SUBDIR, props); - createFile(igfsSecondary, FILE, true, /*BLOCK_SIZE,*/ chunk); + createFile(igfsSecondary, FILE, /*BLOCK_SIZE,*/ chunk); appendFile(igfs, FILE, chunk); @@ -1375,7 +1375,7 @@ public abstract class IgfsDualAbstractSelfTest extends IgfsAbstractSelfTest { igfsSecondaryFileSystem.update(DIR, propsDir); igfsSecondaryFileSystem.update(SUBDIR, propsSubDir); - createFile(igfsSecondary, FILE, true, /*BLOCK_SIZE,*/ chunk); + createFile(igfsSecondary, FILE, /*BLOCK_SIZE,*/ chunk); appendFile(igfs, FILE, chunk);
