Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1b552658 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1b552658 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1b552658 Branch: refs/heads/trunk Commit: 1b552658bdf132b3f8921f2fa22d8d3fdcf2a2b2 Parents: 979b19b 7f5dc69 Author: Jason Brown <[email protected]> Authored: Sat Mar 4 15:39:28 2017 -0800 Committer: Jason Brown <[email protected]> Committed: Sat Mar 4 15:39:59 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/1b552658/test/unit/org/apache/cassandra/db/DirectoriesTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/db/DirectoriesTest.java index 904354a,7e800e6..ffd4d3e --- a/test/unit/org/apache/cassandra/db/DirectoriesTest.java +++ b/test/unit/org/apache/cassandra/db/DirectoriesTest.java @@@ -147,19 -149,19 +147,19 @@@ public class DirectoriesTes } @Test - public void testStandardDirs() + public void testStandardDirs() throws IOException { - for (CFMetaData cfm : CFM) + for (TableMetadata cfm : CFM) { Directories directories = new Directories(cfm); assertEquals(cfDir(cfm), directories.getDirectoryForNewSSTables()); - Descriptor desc = new Descriptor(cfDir(cfm), KS, cfm.cfName, 1, SSTableFormat.Type.BIG); + Descriptor desc = new Descriptor(cfDir(cfm), KS, cfm.name, 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)); } }
