Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/77d45ea5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/77d45ea5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/77d45ea5 Branch: refs/heads/trunk Commit: 77d45ea53ebabd92c02e1da8c143a2826b0cbd5d Parents: e3968cf 44fefef Author: Jason Brown <jasedbr...@gmail.com> Authored: Sat Mar 4 15:37:38 2017 -0800 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Sat Mar 4 15:38:20 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/77d45ea5/test/unit/org/apache/cassandra/db/DirectoriesTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/db/DirectoriesTest.java index f8d01a8,bc5b7bf..7c4ff7a --- a/test/unit/org/apache/cassandra/db/DirectoriesTest.java +++ b/test/unit/org/apache/cassandra/db/DirectoriesTest.java @@@ -152,12 -144,12 +152,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.Type.FINAL); + Descriptor desc = new Descriptor(cfDir(cfm), KS, cfm.cfName, 1); 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)); } }
