mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2026-05-05 04:06:49 +02:00
Code Issues Projects Releases Wiki Activity

Unit test fix - timeout is not correctly set in parallel execution environment

Browse Source 
Change-Id: Id3089c45ad217113f9c01c93e2047114b7fbccb4
This commit is contained in:
Charles Chan 2018-12-21 13:55:29 -08:00
parent 15cd86f9a7
commit b4f4fdbcee
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/net/src/main/java/org/onosproject/net/flowobjective/impl/InOrderFlowObjectiveManager.java
View File

@ -63,7 +63,8 @@ public class InOrderFlowObjectiveManager extends FlowObjectiveManager {
private final Logger log = LoggerFactory.getLogger(getClass());
// TODO Make queue timeout configurable
static int objTimeoutMs = 15000;
static final int DEFAULT_OBJ_TIMEOUT = 15000;
int objTimeoutMs = DEFAULT_OBJ_TIMEOUT;
private Cache<FilteringObjQueueKey, Objective> filtObjQueueHead;
private Cache<ForwardingObjQueueKey, Objective> fwdObjQueueHead;

14
core/net/src/test/java/org/onosproject/net/flowobjective/impl/InOrderFlowObjectiveManagerTest.java
View File

@ -98,7 +98,7 @@ public class InOrderFlowObjectiveManagerTest {
// Delay flow objectives OFFSET + rand(0, BOUND) millis
private static final int DEFAULT_OFFSET = 10; // ms
private static final int DEFAULT_BOUND = 40; // ms
private static final int TIMEOUT_THRESH = 100; // ms
private static final int TIMEOUT_THRESH = 500; // ms
private static int offset = DEFAULT_OFFSET;
private static int bound = DEFAULT_BOUND;
@ -186,7 +186,12 @@ public class InOrderFlowObjectiveManagerTest {
@Before
public void setUp() {
internalSetup(InOrderFlowObjectiveManager.DEFAULT_OBJ_TIMEOUT);
}
private void internalSetup(int objTimeoutMs) {
mgr = new InOrderFlowObjectiveManager();
mgr.objTimeoutMs = objTimeoutMs;
mgr.pipeliners.put(DEV1, pipeliner);
mgr.executorService = newFixedThreadPool(4, groupedThreads("foo", "bar"));
mgr.cfgService = createMock(ComponentConfigService.class);
@ -251,15 +256,14 @@ public class InOrderFlowObjectiveManagerTest {
Lists.newArrayList(fwdTimeout, FWD1, FWD2));
// Reduce timeout so the unit test doesn't have to wait many seconds
InOrderFlowObjectiveManager.objTimeoutMs = TIMEOUT_THRESH;
setUp();
internalSetup(TIMEOUT_THRESH);
expect(mgr.flowObjectiveStore.getNextGroup(NID1)).andReturn(NGRP1).times(2);
expect(mgr.flowObjectiveStore.getNextGroup(NID2)).andReturn(NGRP2).times(2);
replay(mgr.flowObjectiveStore);
// Force this objective to time out
offset = InOrderFlowObjectiveManager.objTimeoutMs * 2;
offset = mgr.objTimeoutMs * 2;
expectFwdObjsTimeout.forEach(fwdObj -> mgr.forward(DEV1, fwdObj));
@ -267,7 +271,7 @@ public class InOrderFlowObjectiveManagerTest {
int expectedTime = (bound + offset) * 3;
assertAfter(expectedTime, expectedTime * 5, () -> assertEquals(expectFwdObjsTimeout.size(), actualObjs.size()));
assertTrue(counter.get() != 0);
assertAfter(expectedTime, expectedTime * 5, () -> assertTrue(counter.get() != 0));
assertTrue(actualObjs.indexOf(fwdTimeout) < actualObjs.indexOf(FWD1));
verify(mgr.flowObjectiveStore);