From c5518ca777ecd68d90f2e1f7003b25da785c9618 Mon Sep 17 00:00:00 2001 From: Siyao Meng <50227127+smengcl@users.noreply.github.com> Date: Thu, 19 Aug 2021 22:44:39 -0700 Subject: [PATCH] Fix TestBlockReaderFactory. Change-Id: Ic39ad7c369fdf3d32fdeeec01bef3b1d8f0799f6 --- .../hadoop/hdfs/client/impl/TestBlockReaderFactory.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/client/impl/TestBlockReaderFactory.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/client/impl/TestBlockReaderFactory.java index 9de9db530ea..be869531137 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/client/impl/TestBlockReaderFactory.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/client/impl/TestBlockReaderFactory.java @@ -24,7 +24,6 @@ import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_DOMAIN_SOCKET_PATH_KEY; import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_SHORT_CIRCUIT_SHARED_MEMORY_WATCHER_INTERRUPT_CHECK_MS; import static org.apache.hadoop.hdfs.client.HdfsClientConfigKeys.DFS_DOMAIN_SOCKET_DISABLE_INTERVAL_SECOND_DEFAULT; import static org.apache.hadoop.hdfs.client.HdfsClientConfigKeys.DFS_DOMAIN_SOCKET_DISABLE_INTERVAL_SECOND_KEY; -import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; import java.io.File; @@ -67,7 +66,6 @@ import org.junit.Rule; import org.junit.Test; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Assumptions; import org.junit.jupiter.api.BeforeEach; import org.apache.hadoop.thirdparty.com.google.common.util.concurrent.Uninterruptibles; import org.junit.rules.ExpectedException; @@ -88,7 +86,7 @@ public class TestBlockReaderFactory { @BeforeEach public void init() { DomainSocket.disableBindPathValidation(); - Assumptions.assumeThat(DomainSocket.getLoadingFailureReason(), equalTo(null)); + Assertions.assertNull(DomainSocket.getLoadingFailureReason()); } @AfterEach