Code Review
/
netvirt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Adding sleep to handle Acl test failures, due to unceratin fails.
[netvirt.git]
/
aclservice
/
impl
/
src
/
test
/
java
/
org
/
opendaylight
/
netvirt
/
aclservice
/
tests
/
AclServiceTestBase.java
diff --git
a/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceTestBase.java
b/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceTestBase.java
index 1bb5673955c27029885a09494bea21c9c998fefb..c7a34178e115c16023b6a249b81137e38f474bbb 100644
(file)
--- a/
aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceTestBase.java
+++ b/
aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceTestBase.java
@@
-19,7
+19,6
@@
import java.util.stream.Collectors;
import javax.inject.Inject;
import org.eclipse.xtext.xbase.lib.Pair;
import org.junit.Before;
import javax.inject.Inject;
import org.eclipse.xtext.xbase.lib.Pair;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.opendaylight.genius.datastoreutils.SingleTransactionDataBroker;
import org.junit.Rule;
import org.junit.Test;
import org.opendaylight.genius.datastoreutils.SingleTransactionDataBroker;
@@
-148,7
+147,7
@@
public abstract class AclServiceTestBase {
putNewStateInterface(dataBroker, "port1", PORT_MAC_1);
asyncEventsWaiter.awaitEventsConsumption();
putNewStateInterface(dataBroker, "port1", PORT_MAC_1);
asyncEventsWaiter.awaitEventsConsumption();
-
+ Thread.sleep(1000);
// Then
newInterfaceCheck();
LOG.info("newInterface - end");
// Then
newInterfaceCheck();
LOG.info("newInterface - end");
@@
-157,7
+156,6
@@
public abstract class AclServiceTestBase {
abstract void newInterfaceCheck();
@Test
abstract void newInterfaceCheck();
@Test
- @Ignore
public void newInterfaceWithEtherTypeAcl() throws Exception {
LOG.info("newInterfaceWithEtherTypeAcl - start");
public void newInterfaceWithEtherTypeAcl() throws Exception {
LOG.info("newInterfaceWithEtherTypeAcl - start");
@@
-190,7
+188,7
@@
public abstract class AclServiceTestBase {
asyncEventsWaiter.awaitEventsConsumption();
asyncEventsWaiter.awaitEventsConsumption();
asyncEventsWaiter.awaitEventsConsumption();
asyncEventsWaiter.awaitEventsConsumption();
-
+ Thread.sleep(1000);
// Then
newInterfaceWithEtherTypeAclCheck();
LOG.info("newInterfaceWithEtherTypeAcl - end");
// Then
newInterfaceWithEtherTypeAclCheck();
LOG.info("newInterfaceWithEtherTypeAcl - end");
@@
-231,7
+229,7
@@
public abstract class AclServiceTestBase {
asyncEventsWaiter.awaitEventsConsumption();
asyncEventsWaiter.awaitEventsConsumption();
asyncEventsWaiter.awaitEventsConsumption();
asyncEventsWaiter.awaitEventsConsumption();
-
+ Thread.sleep(1000);
// Then
newInterfaceWithEtherTypeAclCheck();
// Then
newInterfaceWithEtherTypeAclCheck();
@@
-264,6
+262,7
@@
public abstract class AclServiceTestBase {
asyncEventsWaiter.awaitEventsConsumption();
asyncEventsWaiter.awaitEventsConsumption();
asyncEventsWaiter.awaitEventsConsumption();
asyncEventsWaiter.awaitEventsConsumption();
+ Thread.sleep(1000);
newInterfaceWithMultipleAclCheck();
}
newInterfaceWithMultipleAclCheck();
}
@@
-304,7
+303,7
@@
public abstract class AclServiceTestBase {
asyncEventsWaiter.awaitEventsConsumption();
asyncEventsWaiter.awaitEventsConsumption();
asyncEventsWaiter.awaitEventsConsumption();
asyncEventsWaiter.awaitEventsConsumption();
-
+ Thread.sleep(1000);
// Then
newInterfaceWithTcpDstAclCheck();
LOG.info("newInterfaceWithTcpDstAcl - end");
// Then
newInterfaceWithTcpDstAclCheck();
LOG.info("newInterfaceWithTcpDstAcl - end");
@@
-348,7
+347,7
@@
public abstract class AclServiceTestBase {
asyncEventsWaiter.awaitEventsConsumption();
asyncEventsWaiter.awaitEventsConsumption();
asyncEventsWaiter.awaitEventsConsumption();
asyncEventsWaiter.awaitEventsConsumption();
-
+ Thread.sleep(1000);
// Then
newInterfaceWithUdpDstAclCheck();
LOG.info("newInterfaceWithUdpDstAcl - end");
// Then
newInterfaceWithUdpDstAclCheck();
LOG.info("newInterfaceWithUdpDstAcl - end");
@@
-376,7
+375,7
@@
public abstract class AclServiceTestBase {
asyncEventsWaiter.awaitEventsConsumption();
asyncEventsWaiter.awaitEventsConsumption();
asyncEventsWaiter.awaitEventsConsumption();
asyncEventsWaiter.awaitEventsConsumption();
-
+ Thread.sleep(1000);
// Then
newInterfaceWithIcmpAclCheck();
LOG.info("newInterfaceWithIcmpAcl - end");
// Then
newInterfaceWithIcmpAclCheck();
LOG.info("newInterfaceWithIcmpAcl - end");
@@
-411,7
+410,7
@@
public abstract class AclServiceTestBase {
asyncEventsWaiter.awaitEventsConsumption();
asyncEventsWaiter.awaitEventsConsumption();
asyncEventsWaiter.awaitEventsConsumption();
asyncEventsWaiter.awaitEventsConsumption();
-
+ Thread.sleep(1000);
// Then
newInterfaceWithDstPortRangeCheck();
LOG.info("newInterfaceWithDstPortRange - end");
// Then
newInterfaceWithDstPortRangeCheck();
LOG.info("newInterfaceWithDstPortRange - end");
@@
-420,7
+419,6
@@
public abstract class AclServiceTestBase {
abstract void newInterfaceWithDstPortRangeCheck();
@Test
abstract void newInterfaceWithDstPortRangeCheck();
@Test
- @Ignore
public void newInterfaceWithDstAllPorts() throws Exception {
LOG.info("newInterfaceWithDstAllPorts - start");
public void newInterfaceWithDstAllPorts() throws Exception {
LOG.info("newInterfaceWithDstAllPorts - start");
@@
-447,7
+445,7
@@
public abstract class AclServiceTestBase {
asyncEventsWaiter.awaitEventsConsumption();
asyncEventsWaiter.awaitEventsConsumption();
asyncEventsWaiter.awaitEventsConsumption();
asyncEventsWaiter.awaitEventsConsumption();
-
+ Thread.sleep(1000);
// Then
newInterfaceWithDstAllPortsCheck();
LOG.info("newInterfaceWithDstAllPorts - end");
// Then
newInterfaceWithDstAllPortsCheck();
LOG.info("newInterfaceWithDstAllPorts - end");
@@
-493,7
+491,7
@@
public abstract class AclServiceTestBase {
asyncEventsWaiter.awaitEventsConsumption();
asyncEventsWaiter.awaitEventsConsumption();
asyncEventsWaiter.awaitEventsConsumption();
asyncEventsWaiter.awaitEventsConsumption();
-
+ Thread.sleep(1000);
// Then
newInterfaceWithTwoAclsHavingSameRulesCheck();
LOG.info("newInterfaceWithTwoAclsHavingSameRules - end");
// Then
newInterfaceWithTwoAclsHavingSameRulesCheck();
LOG.info("newInterfaceWithTwoAclsHavingSameRules - end");
@@
-519,7
+517,7
@@
public abstract class AclServiceTestBase {
asyncEventsWaiter.awaitEventsConsumption();
asyncEventsWaiter.awaitEventsConsumption();
asyncEventsWaiter.awaitEventsConsumption();
asyncEventsWaiter.awaitEventsConsumption();
-
+ Thread.sleep(1000);
// Then
newInterfaceWithIcmpAclCheck();
}
// Then
newInterfaceWithIcmpAclCheck();
}
@@
-545,7
+543,7
@@
public abstract class AclServiceTestBase {
asyncEventsWaiter.awaitEventsConsumption();
asyncEventsWaiter.awaitEventsConsumption();
asyncEventsWaiter.awaitEventsConsumption();
asyncEventsWaiter.awaitEventsConsumption();
-
+ Thread.sleep(1000);
// Then
newInterfaceWithAapIpv4AllCheck();
LOG.info("newInterfaceWithAapIpv4All test - end");
// Then
newInterfaceWithAapIpv4AllCheck();
LOG.info("newInterfaceWithAapIpv4All test - end");
@@
-572,7
+570,7
@@
public abstract class AclServiceTestBase {
asyncEventsWaiter.awaitEventsConsumption();
asyncEventsWaiter.awaitEventsConsumption();
asyncEventsWaiter.awaitEventsConsumption();
asyncEventsWaiter.awaitEventsConsumption();
-
+ Thread.sleep(1000);
// Then
newInterfaceWithAapCheck();
LOG.info("newInterfaceWithAap test - end");
// Then
newInterfaceWithAapCheck();
LOG.info("newInterfaceWithAap test - end");