[hadoop] branch trunk updated: HDDS-2264. Improve output of TestOzoneContainer

[ae...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

aengineer 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 cfba6ac  HDDS-2264. Improve output of TestOzoneContainer
cfba6ac is described below

commit cfba6ac9512b180d598a7a477a1ee0ea251e7b41
Author: Doroszlai, Attila <ad...@apache.org>
AuthorDate: Mon Oct 7 13:08:14 2019 +0200

    HDDS-2264. Improve output of TestOzoneContainer
    
    Signed-off-by: Anu Engineer <ae...@apache.org>
---
 .../container/ozoneimpl/TestOzoneContainer.java    | 23 ++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java
index b0d3a0f..2d679a1 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java
@@ -41,12 +41,15 @@ import org.apache.hadoop.ozone.container.common.volume.VolumeSet;
 import org.apache.hadoop.ozone.container.keyvalue.KeyValueContainer;
 import org.apache.hadoop.ozone.container.keyvalue.KeyValueContainerData;
 import org.apache.hadoop.ozone.container.keyvalue.helpers.BlockUtils;
+import org.apache.hadoop.test.LambdaTestUtils;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 import org.mockito.Mockito;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.Random;
 import java.util.UUID;
@@ -62,6 +65,9 @@ import static org.junit.Assert.assertEquals;
  */
 public class TestOzoneContainer {
 
+  private static final Logger LOG =
+      LoggerFactory.getLogger(TestOzoneContainer.class);
+
   @Rule
   public TemporaryFolder folder = new TemporaryFolder();
 
@@ -148,7 +154,6 @@ public class TestOzoneContainer {
   @Test
   public void testContainerCreateDiskFull() throws Exception {
     long containerSize = (long) StorageUnit.MB.toBytes(100);
-    boolean diskSpaceException = false;
 
     // Format the volumes
     for (HddsVolume volume : volumeSet.getVolumesList()) {
@@ -164,16 +169,14 @@ public class TestOzoneContainer {
     keyValueContainer = new KeyValueContainer(keyValueContainerData, conf);
 
     // we expect an out of space Exception
-    try {
-      keyValueContainer.create(volumeSet, volumeChoosingPolicy, scmId);
-    } catch (StorageContainerException e) {
-      if (e.getResult() == DISK_OUT_OF_SPACE) {
-        diskSpaceException = true;
-      }
+    StorageContainerException e = LambdaTestUtils.intercept(
+        StorageContainerException.class,
+        () -> keyValueContainer.create(volumeSet, volumeChoosingPolicy, scmId)
+    );
+    if (!DISK_OUT_OF_SPACE.equals(e.getResult())) {
+      LOG.info("Unexpected error during container creation", e);
     }
-
-    // Test failed if there was no exception
-    assertEquals(true, diskSpaceException);
+    assertEquals(DISK_OUT_OF_SPACE, e.getResult());
   }
 
   //verify committed space on each volume


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org