From 983b78afdc8939d0d2116f23837d958e6b5d9e46 Mon Sep 17 00:00:00 2001
From: Mukul Kumar Singh <msingh@apache.org>
Date: Thu, 14 Mar 2019 16:49:43 +0530
Subject: [PATCH] HDDS-1237. Fix test
 TestSecureContainerServer.testClientServerRatisGrpc. Contributed by Mukul
 Kumar Singh.

---
 .../ozone/container/server/TestSecureContainerServer.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/server/TestSecureContainerServer.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/server/TestSecureContainerServer.java
index f20feffce9..3d631cc17b 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/server/TestSecureContainerServer.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/server/TestSecureContainerServer.java
@@ -30,6 +30,7 @@
 import org.apache.hadoop.hdds.scm.XceiverClientSpi;
 import org.apache.hadoop.hdds.scm.container.common.helpers.StorageContainerException;
 import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
+import org.apache.hadoop.hdds.scm.storage.ContainerProtocolCalls;
 import org.apache.hadoop.ozone.OzoneConfigKeys;
 import org.apache.hadoop.ozone.RatisTestHelper;
 import org.apache.hadoop.ozone.container.ContainerTestHelper;
@@ -179,7 +180,8 @@ static void runTestClientServer(
 
       XceiverClientSpi finalClient = client;
       LambdaTestUtils.intercept(IOException.class,
-          () -> finalClient.sendCommand(request));
+          () -> ContainerProtocolCalls
+              .validateContainerResponse(finalClient.sendCommand(request)));
 
       // Test 2: Test success in request with valid block token.
       final ContainerCommandRequestProto request2 =
@@ -191,7 +193,8 @@ static void runTestClientServer(
 
       XceiverClientSpi finalClient2 = client;
       LambdaTestUtils.intercept(IOException.class, "",
-          () -> finalClient2.sendCommand(request));
+          () -> ContainerProtocolCalls
+              .validateContainerResponse(finalClient2.sendCommand(request)));
     } finally {
       if (client != null) {
         client.close();