HDFS-7115. TestEncryptionZones assumes Unix path separator for KMS key store path. Contributed by Xiaoyu Yao.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/26cba7f3 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/26cba7f3 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/26cba7f3 Branch: refs/heads/HDFS-6581 Commit: 26cba7f35ff24262afa5d8f9ed22f3a7f01d9a71 Parents: 7039b98 Author: cnauroth <cnaur...@apache.org> Authored: Mon Sep 22 09:07:07 2014 -0700 Committer: cnauroth <cnaur...@apache.org> Committed: Mon Sep 22 09:07:07 2014 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/hdfs/TestEncryptionZones.java | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/26cba7f3/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index d95e228..c4e3e27 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -917,6 +917,9 @@ Release 2.6.0 - UNRELEASED HDFS-7110. Skip tests related to short-circuit read on platforms that do not currently implement short-circuit read. (cnauroth) + HDFS-7115. TestEncryptionZones assumes Unix path separator for KMS key store + path. (Xiaoyu Yao via cnauroth) + Release 2.5.1 - 2014-09-05 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/26cba7f3/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestEncryptionZones.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestEncryptionZones.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestEncryptionZones.java index 52ca942..b80fd45 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestEncryptionZones.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestEncryptionZones.java @@ -116,8 +116,8 @@ public class TestEncryptionZones { protected FileContextTestWrapper fcWrapper; protected String getKeyProviderURI() { - return JavaKeyStoreProvider.SCHEME_NAME + "://file" + testRootDir + - "/test.jks"; + return JavaKeyStoreProvider.SCHEME_NAME + "://file" + + new Path(testRootDir.toString(), "test.jks").toUri(); } @Before @@ -1043,7 +1043,7 @@ public class TestEncryptionZones { dfsAdmin.createEncryptionZone(zone, TEST_KEY); DFSTestUtil.createFile(fs, zoneFile, len, (short) 1, 0xFEED); String contents = DFSTestUtil.readFile(fs, zoneFile); - final Path snap1 = fs.createSnapshot(zoneParent); + final Path snap1 = fs.createSnapshot(zoneParent, "snap1"); final Path snap1Zone = new Path(snap1, zone.getName()); assertEquals("Got unexpected ez path", zone.toString(), dfsAdmin.getEncryptionZoneForPath(snap1Zone).getPath().toString()); @@ -1052,14 +1052,14 @@ public class TestEncryptionZones { // snapshot fsWrapper.delete(zone, true); fsWrapper.mkdir(zone, FsPermission.getDirDefault(), true); - final Path snap2 = fs.createSnapshot(zoneParent); + final Path snap2 = fs.createSnapshot(zoneParent, "snap2"); final Path snap2Zone = new Path(snap2, zone.getName()); assertNull("Expected null ez path", dfsAdmin.getEncryptionZoneForPath(snap2Zone)); // Create the encryption zone again dfsAdmin.createEncryptionZone(zone, TEST_KEY2); - final Path snap3 = fs.createSnapshot(zoneParent); + final Path snap3 = fs.createSnapshot(zoneParent, "snap3"); final Path snap3Zone = new Path(snap3, zone.getName()); // Check that snap3's EZ has the correct settings EncryptionZone ezSnap3 = dfsAdmin.getEncryptionZoneForPath(snap3Zone);
