Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion dev-support/bin/hadoop.sh
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,7 @@ function shadedclient_rebuild

extra=(
"-Dtest=NoUnitTests"
"-Dsurefire.failIfNoSpecifiedTests=false"
"-Dmaven.javadoc.skip=true"
"-Dcheckstyle.skip=true"
"-Dspotbugs.skip=true"
Expand Down Expand Up @@ -619,7 +620,7 @@ function shadedclient_rebuild
echo_and_redirect "${logfile}" \
"${MAVEN}" "${MAVEN_ARGS[@]}" verify -fae --batch-mode -am \
"${modules[@]}" \
-DskipShade -Dtest=NoUnitTests -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true \
-DskipShade -Dtest=NoUnitTests -Dsurefire.failIfNoSpecifiedTests=false -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true \
-Dspotbugs.skip=true ${extra[*]}

count=$("${GREP}" -c '\[ERROR\]' "${logfile}")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.slf4j.event.Level;
Expand All @@ -38,6 +39,7 @@
import java.net.URISyntaxException;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;

Expand All @@ -46,6 +48,7 @@
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Timeout.ThreadMode.SEPARATE_THREAD;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

Expand Down Expand Up @@ -344,6 +347,8 @@ private void testResolveDomainNameUsingDNS(boolean useFQDN) throws Exception {
assertTrue(nn2Count.get() > 0, "nn2 should have been selected: " + nn2Count.get());
}

// FIXME Sometimes java.net.Inet4AddressImpl.lookupAllHostAddr() hangs. Why ?
@Timeout(value=1, unit = TimeUnit.MINUTES, threadMode = SEPARATE_THREAD)
@Test
public void testResolveDomainNameUsingDNS() throws Exception {
// test resolving to IP
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.TimeUnit;

import org.apache.hadoop.fs.CommonConfigurationKeys;
import org.apache.hadoop.fs.FileSystem;
Expand Down Expand Up @@ -69,12 +70,15 @@
import org.apache.hadoop.util.Progressable;
import org.apache.hadoop.yarn.security.AMRMTokenIdentifier;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import static org.junit.jupiter.api.Timeout.ThreadMode.SEPARATE_THREAD;

@Timeout(value=1, unit = TimeUnit.MINUTES, threadMode = SEPARATE_THREAD)
public class TestPipeApplication {
private static File workSpace = new File("target",
TestPipeApplication.class.getName() + "-workSpace");
Expand Down
8 changes: 4 additions & 4 deletions hadoop-project/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@
</extraJavaTestArgs>
<!-- Plugin versions and config -->
<maven-surefire-plugin.argLine>-Xmx2048m -Xss2m -XX:+HeapDumpOnOutOfMemoryError ${extraJavaTestArgs}</maven-surefire-plugin.argLine>
<maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>
<maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version>
<maven-surefire-report-plugin.version>${maven-surefire-plugin.version}</maven-surefire-report-plugin.version>
<maven-failsafe-plugin.version>${maven-surefire-plugin.version}</maven-failsafe-plugin.version>

Expand Down Expand Up @@ -223,9 +223,9 @@
<sshd.version>2.11.0</sshd.version>
<hbase.version>2.6.1-hadoop3</hbase.version>
<junit.version>4.13.2</junit.version>
<junit.jupiter.version>5.8.2</junit.jupiter.version>
<junit.vintage.version>5.8.2</junit.vintage.version>
<junit.platform.version>1.8.2</junit.platform.version>
<junit.jupiter.version>5.12.2</junit.jupiter.version>
<junit.vintage.version>5.12.2</junit.vintage.version>
<junit.platform.version>1.12.2</junit.platform.version>
<assertj.version>3.12.2</assertj.version>
<jline.version>3.9.0</jline.version>
<powermock.version>2.0.9</powermock.version>
Expand Down