Apache/nifi
1
0
Fork 0
mirror of https://github.com/apache/nifi.git synced 2025-02-06 10:08:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

NIFI-9925 Adjust PutUDP and SNMP tests to run without preferring IPv4

Browse Source 
This closes #5976

Signed-off-by: David Handermann <exceptionfactory@apache.org>
This commit is contained in:
Paul Grey 2022-04-14 13:48:47 -04:00 committed by exceptionfactory
parent 18a4182cb0
commit 0a94762119
No known key found for this signature in database
GPG Key ID: 29B6A52D2AAE8DBA
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/factory/core/V1V2cSNMPFactoryTest.java
View File

@ -25,10 +25,13 @@ import org.snmp4j.Snmp;
import org.snmp4j.Target; import org.snmp4j.Target;
import org.snmp4j.security.SecurityLevel; import org.snmp4j.security.SecurityLevel;
import java.util.regex.Pattern;
import static org.apache.nifi.snmp.helper.configurations.SNMPConfigurationFactory.LOCALHOST; import static org.apache.nifi.snmp.helper.configurations.SNMPConfigurationFactory.LOCALHOST;
import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.core.IsInstanceOf.instanceOf; import static org.hamcrest.core.IsInstanceOf.instanceOf;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
@ -62,7 +65,7 @@ public class V1V2cSNMPFactoryTest {
final Snmp snmpManager = snmpFactory.createSnmpManagerInstance(snmpConfiguration); final Snmp snmpManager = snmpFactory.createSnmpManagerInstance(snmpConfiguration);
final String address = snmpManager.getMessageDispatcher().getTransportMappings().iterator().next().getListenAddress().toString(); final String address = snmpManager.getMessageDispatcher().getTransportMappings().iterator().next().getListenAddress().toString();
assertEquals("0.0.0.0" + "/" + managerPort, address); assertTrue(Pattern.compile("0.+?0/" + managerPort).matcher(address).matches());
} }
@Test @Test

4
nifi-nar-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/test/java/org/apache/nifi/snmp/factory/core/V3SNMPFactoryTest.java
View File

@ -28,6 +28,8 @@ import org.snmp4j.security.USM;
import org.snmp4j.smi.Integer32; import org.snmp4j.smi.Integer32;
import org.snmp4j.smi.OctetString; import org.snmp4j.smi.OctetString;
import java.util.regex.Pattern;
import static org.apache.nifi.snmp.helper.configurations.SNMPConfigurationFactory.LOCALHOST; import static org.apache.nifi.snmp.helper.configurations.SNMPConfigurationFactory.LOCALHOST;
import static org.apache.nifi.snmp.helper.configurations.SNMPV3ConfigurationFactory.AUTH_PASSPHRASE; import static org.apache.nifi.snmp.helper.configurations.SNMPV3ConfigurationFactory.AUTH_PASSPHRASE;
import static org.apache.nifi.snmp.helper.configurations.SNMPV3ConfigurationFactory.AUTH_PROTOCOL; import static org.apache.nifi.snmp.helper.configurations.SNMPV3ConfigurationFactory.AUTH_PROTOCOL;
@ -73,7 +75,7 @@ public class V3SNMPFactoryTest {
final String address = snmpManager.getMessageDispatcher().getTransportMappings().iterator().next().getListenAddress().toString(); final String address = snmpManager.getMessageDispatcher().getTransportMappings().iterator().next().getListenAddress().toString();
USM usm = (USM) SecurityModels.getInstance().getSecurityModel(new Integer32(3)); USM usm = (USM) SecurityModels.getInstance().getSecurityModel(new Integer32(3));
assertEquals("0.0.0.0" + "/" + managerPort, address); assertTrue(Pattern.compile("0.+?0/" + managerPort).matcher(address).matches());
assertTrue(usm.hasUser(null, new OctetString("SHAAES128"))); assertTrue(usm.hasUser(null, new OctetString("SHAAES128")));
} }

9
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestPutUDP.java
View File

@ -58,7 +58,7 @@ public class TestPutUDP {
private final static char CONTENT_CHAR = 'x'; private final static char CONTENT_CHAR = 'x';
private final static int DATA_WAIT_PERIOD = 50; private final static int DATA_WAIT_PERIOD = 50;
private final static int DEFAULT_TEST_TIMEOUT_PERIOD = 10000; private final static int DEFAULT_TEST_TIMEOUT_PERIOD = 10000;
private final static int LONG_TEST_TIMEOUT_PERIOD = 100000; private final static int LONG_TEST_TIMEOUT_PERIOD = 30000;
private TestRunner runner; private TestRunner runner;
private int port; private int port;
@ -187,18 +187,17 @@ public class TestPutUDP {
runner.assertValid(); runner.assertValid();
} }
private void sendTestData(final String[] testData) throws InterruptedException { private void sendTestData(final String[] testData) {
sendTestData(testData, DEFAULT_ITERATIONS, DEFAULT_THREAD_COUNT); sendTestData(testData, DEFAULT_ITERATIONS, DEFAULT_THREAD_COUNT);
} }
private void sendTestData(final String[] testData, final int iterations, final int threadCount) throws InterruptedException { private void sendTestData(final String[] testData, final int iterations, final int threadCount) {
for (String item : testData) { for (String item : testData) {
runner.setThreadCount(threadCount); runner.setThreadCount(threadCount);
for (int i = 0; i < iterations; i++) { for (int i = 0; i < iterations; i++) {
runner.enqueue(item.getBytes()); runner.enqueue(item.getBytes());
runner.run(1, false);
Thread.sleep(1);
} }
runner.run(iterations, false);
} }
// ensure @OnStopped methods get called // ensure @OnStopped methods get called