You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by el...@apache.org on 2019/01/23 10:34:18 UTC
[hadoop] branch trunk updated: HDDS-982. Fix
TestContainerDataYaml#testIncorrectContainerFile. Contributed by Doroszlai,
Attila.
This is an automated email from the ASF dual-hosted git repository.
elek pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 2d69a35 HDDS-982. Fix TestContainerDataYaml#testIncorrectContainerFile. Contributed by Doroszlai, Attila.
2d69a35 is described below
commit 2d69a3561400eaab683a3c809a6d086bb8abddc7
Author: Márton Elek <el...@apache.org>
AuthorDate: Wed Jan 23 11:31:07 2019 +0100
HDDS-982. Fix TestContainerDataYaml#testIncorrectContainerFile. Contributed by Doroszlai, Attila.
---
.../ozone/container/common/impl/TestContainerDataYaml.java | 9 ++++-----
.../container-service/src/test/resources/incorrect.container | 2 +-
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerDataYaml.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerDataYaml.java
index a52e18b..c611ccb 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerDataYaml.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerDataYaml.java
@@ -138,15 +138,14 @@ public class TestContainerDataYaml {
KeyValueContainerData kvData = (KeyValueContainerData) ContainerDataYaml
.readContainerFile(file);
fail("testIncorrectContainerFile failed");
- } catch (IllegalStateException ex) {
- GenericTestUtils.assertExceptionContains("Unexpected " +
- "ContainerLifeCycleState", ex);
+ } catch (IllegalArgumentException ex) {
+ GenericTestUtils.assertExceptionContains("No enum constant", ex);
}
}
@Test
- public void testCheckBackWardCompatabilityOfContainerFile() throws
+ public void testCheckBackWardCompatibilityOfContainerFile() throws
IOException {
// This test is for if we upgrade, and then .container files added by new
// server will have new fields added to .container file, after a while we
@@ -178,7 +177,7 @@ public class TestContainerDataYaml {
} catch (Exception ex) {
ex.printStackTrace();
- fail("testCheckBackWardCompatabilityOfContainerFile failed");
+ fail("testCheckBackWardCompatibilityOfContainerFile failed");
}
}
diff --git a/hadoop-hdds/container-service/src/test/resources/incorrect.container b/hadoop-hdds/container-service/src/test/resources/incorrect.container
index d14c75f..38384c8 100644
--- a/hadoop-hdds/container-service/src/test/resources/incorrect.container
+++ b/hadoop-hdds/container-service/src/test/resources/incorrect.container
@@ -9,5 +9,5 @@ maxSize: 5368709120
originPipelineId: b2c96aa4-b757-4f97-b286-6fb80a1baf8e
originNodeId: 6dcfb385-caea-4efb-9ef3-f87fadca0f51
metadata: {OWNER: ozone, VOLUME: hdfs}
-state: INVALID
+state: NO_SUCH_STATE
checksum: 08bc9d390f9183aeed3cf33c789e2a07310bba60f3cf55941caccc939db8670f
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org