NMS-6903 use a random open port for the test

OpenNMS · Sep 26, 2014 · 40d48ab · 40d48ab
1 parent 0b559b0
commit 40d48ab
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/tests/mock-snmp-agent/src/test/java/org/opennms/mock/snmp/MockSnmpAgentTest.java b/tests/mock-snmp-agent/src/test/java/org/opennms/mock/snmp/MockSnmpAgentTest.java
@@ -76,7 +76,6 @@
 
 @RunWith(Parameterized.class)
 public class MockSnmpAgentTest  {
-
     @Parameters
     public static Collection<Object[]> versions() {
         return Arrays.asList(new Object[][] {
@@ -144,7 +143,9 @@ public void setUp() throws Exception {
         m_usm = new USM(SecurityProtocols.getInstance(), new OctetString(MPv3.createLocalEngineID()), 0);
         SecurityModels.getInstance().addSecurityModel(m_usm);
 
-        m_agent = MockSnmpAgent.createAgentAndRun(classPathResource("loadSnmpDataTest.properties"), "127.0.0.1/1691");	// Homage to Empire
+        m_agent = MockSnmpAgent.createAgentAndRun(classPathResource("loadSnmpDataTest.properties"), "127.0.0.1/0");
+        Thread.sleep(200);
+        System.err.println("Started MockSnmpAgent on port " + m_agent.getPort());
 
         m_requestedVarbinds = new ArrayList<AnticipatedRequest>();
     }
@@ -155,6 +156,7 @@ public void tearDown() throws Exception {
         if (m_agent != null) {
             m_agent.shutDownAndWait();
         }
+        Thread.sleep(200);
     }
 
     public AnticipatedRequest request(String requestedOid, Variable requestedValue) {
@@ -429,7 +431,7 @@ private PDU sendRequestV1V2(PDU pdu, int version) {
         PDU response = null;
         CommunityTarget target = new CommunityTarget();
         target.setCommunity(new OctetString("public"));
-        target.setAddress(new UdpAddress(InetAddressUtils.addr("127.0.0.1"), 1691));
+        target.setAddress(new UdpAddress(InetAddressUtils.addr("127.0.0.1"), m_agent.getPort()));
         target.setVersion(version);
 
         TransportMapping<UdpAddress> transport = null;
@@ -471,7 +473,7 @@ private PDU sendRequestV3(PDU pdu) {
         UserTarget target = new UserTarget();
         target.setSecurityLevel(SecurityLevel.AUTH_PRIV);
         target.setSecurityName(userId);
-        target.setAddress(new UdpAddress(InetAddressUtils.addr("127.0.0.1"), 1691));
+        target.setAddress(new UdpAddress(InetAddressUtils.addr("127.0.0.1"), m_agent.getPort()));
         target.setVersion(SnmpConstants.version3);
         target.setTimeout(DEFAULT_TIMEOUT);