org.apache.cassandra.db.DirectoriesTest(testStandardDirs) unit test failing
patch by mkjellman, reviewed by jasobrown for CASSANDRA-13231 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/44fefeff Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/44fefeff Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/44fefeff Branch: refs/heads/cassandra-3.11 Commit: 44fefeffa53cf95223c4c7b6f79afaafe9b93e2e Parents: 288d243 Author: Michael Kjellman <kjell...@apple.com> Authored: Sat Mar 4 04:57:34 2017 -0800 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Sat Mar 4 15:37:19 2017 -0800 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/db/DirectoriesTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/44fefeff/test/unit/org/apache/cassandra/db/DirectoriesTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/DirectoriesTest.java b/test/unit/org/apache/cassandra/db/DirectoriesTest.java index 008e343..bc5b7bf 100644 --- a/test/unit/org/apache/cassandra/db/DirectoriesTest.java +++ b/test/unit/org/apache/cassandra/db/DirectoriesTest.java @@ -137,7 +137,7 @@ public class DirectoriesTest } @Test - public void testStandardDirs() + public void testStandardDirs() throws IOException { for (CFMetaData cfm : CFM) { @@ -146,10 +146,10 @@ public class DirectoriesTest Descriptor desc = new Descriptor(cfDir(cfm), KS, cfm.cfName, 1, Descriptor.Type.FINAL); File snapshotDir = new File(cfDir(cfm), File.separator + Directories.SNAPSHOT_SUBDIR + File.separator + "42"); - assertEquals(snapshotDir, Directories.getSnapshotDirectory(desc, "42")); + assertEquals(snapshotDir.getCanonicalFile(), Directories.getSnapshotDirectory(desc, "42")); File backupsDir = new File(cfDir(cfm), File.separator + Directories.BACKUPS_SUBDIR); - assertEquals(backupsDir, Directories.getBackupsDirectory(desc)); + assertEquals(backupsDir.getCanonicalFile(), Directories.getBackupsDirectory(desc)); } }
