IGNITE-825: Disabled test remastered and restored.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/52a733f6 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/52a733f6 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/52a733f6 Branch: refs/heads/ignite-1607 Commit: 52a733f6bdc463b1b5527b29a0817a85bf1ed7bd Parents: 49a5cc5 Author: iveselovskiy <[email protected]> Authored: Thu Oct 15 13:12:52 2015 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Thu Oct 15 13:12:52 2015 +0300 ---------------------------------------------------------------------- .../HadoopIgfs20FileSystemAbstractSelfTest.java | 22 ++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/52a733f6/modules/hadoop/src/test/java/org/apache/ignite/igfs/HadoopIgfs20FileSystemAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/igfs/HadoopIgfs20FileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/igfs/HadoopIgfs20FileSystemAbstractSelfTest.java index b3afd22..9c301c9 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/igfs/HadoopIgfs20FileSystemAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/igfs/HadoopIgfs20FileSystemAbstractSelfTest.java @@ -1124,10 +1124,10 @@ public abstract class HadoopIgfs20FileSystemAbstractSelfTest extends IgfsCommonA is.close(); } - /** @throws Exception If failed. */ + /** + * @throws Exception If failed. + */ public void testRenameDirectoryIfDstPathExists() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-825";); - Path fsHome = new Path(primaryFsUri); Path srcDir = new Path(fsHome, "/tmp/"); Path dstDir = new Path(fsHome, "/tmpNew/"); @@ -1142,11 +1142,21 @@ public abstract class HadoopIgfs20FileSystemAbstractSelfTest extends IgfsCommonA os.close(); - fs.rename(srcDir, dstDir); + try { + fs.rename(srcDir, dstDir); + + fail("FileAlreadyExistsException expected."); + } + catch (FileAlreadyExistsException ignore) { + // No-op. + } + // Check all the files stay unchanged: assertPathExists(fs, dstDir); - assertPathExists(fs, new Path(fsHome, "/tmpNew/tmp")); - assertPathExists(fs, new Path(fsHome, "/tmpNew/tmp/file1")); + assertPathExists(fs, new Path(dstDir, "file2")); + + assertPathExists(fs, srcDir); + assertPathExists(fs, new Path(srcDir, "file1")); } /** @throws Exception If failed. */
