killbill-uncached

util: fix flakiness of TestApiListener#isCompleted TestConsumableInArrear …

1/18/2016 11:55:22 AM

was sometimes failing due to multiple events being dispatched.

The root cause was the following sequence of events:

* Bus event claimed and dispatched
* Test listener notified
* Other listeners (e.g. invoice) start processing the event
* Clock moved
* Bus re-dispatching the same event (because the claim time has now passed)

The reason the clock is moved too early is because we don't listen to null invoice events in the tests.

We already had a work-around in TestApiListener (we wait until there is no more entries in bus_events), however
one code path was by-passing it. This fixes it -- the main drawback is that we introduce a 500ms delay in the worst
case scenario. We could reduce that arbitrary sleep delay in case it causes a significant slowdown in the tests.

This should fix https://github.com/killbill/killbill/issues/382: I ran the test successfully twice with invocationCount = 100
(while before I could trigger the bug by running the test manually a few times).

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>

Pierre-Alexandre Meyer

Commit: c863398

Tree: 3fafbb7

Parents: 85ad2e1

Changes

util/src/test/java/org/killbill/billing/api/TestApiListener.java 3(+0 -3)

Details

util/src/test/java/org/killbill/billing/api/TestApiListener.java 3(+0 -3)

diff --git a/util/src/test/java/org/killbill/billing/api/TestApiListener.java b/util/src/test/java/org/killbill/billing/api/TestApiListener.java
index a5815c4..22bdd60 100644
--- a/util/src/test/java/org/killbill/billing/api/TestApiListener.java
+++ b/util/src/test/java/org/killbill/billing/api/TestApiListener.java
@@ -288,9 +288,6 @@ public class TestApiListener {
 
     public boolean isCompleted(final long timeout) {
         synchronized (this) {
-            if (completed) {
-                return completed;
-            }
             long waitTimeMs = timeout;
             do {
                 try {