Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7f5dc696 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7f5dc696 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7f5dc696 Branch: refs/heads/cassandra-3.11 Commit: 7f5dc696f6658d2e0a40c24276e858a1cf30ce85 Parents: 92b7322 77d45ea Author: Jason Brown <jasedbr...@gmail.com> Authored: Sat Mar 4 15:38:39 2017 -0800 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Sat Mar 4 15:39:11 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/7f5dc696/test/unit/org/apache/cassandra/db/DirectoriesTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/db/DirectoriesTest.java index 5841c36,7c4ff7a..7e800e6 --- a/test/unit/org/apache/cassandra/db/DirectoriesTest.java +++ b/test/unit/org/apache/cassandra/db/DirectoriesTest.java @@@ -156,12 -152,12 +156,12 @@@ public class DirectoriesTes Directories directories = new Directories(cfm); assertEquals(cfDir(cfm), directories.getDirectoryForNewSSTables()); - Descriptor desc = new Descriptor(cfDir(cfm), KS, cfm.cfName, 1); + Descriptor desc = new Descriptor(cfDir(cfm), KS, cfm.cfName, 1, SSTableFormat.Type.BIG); 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)); } }
