Seems like random integration test failure due to concurrency issues …

…(locally test runs ok) Some logging added and timeouts increased (to be slightly greater than server shutdown timeout) to debug the issue
ChargeTimeEU · Jun 27, 2018 · 4e6628e · 4e6628e
1 parent 7cd50d3
commit 4e6628e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/ocpp-v1_6-test/src/main/java/eu/chargetime/ocpp/test/FakeCentralSystem.java b/ocpp-v1_6-test/src/main/java/eu/chargetime/ocpp/test/FakeCentralSystem.java
@@ -104,14 +104,16 @@ public void clientLost() {
     }
 
     public void started() throws Exception {
+        final String host = "127.0.0.1";
+
         if (!isStarted) {
             int port = 8890;
             if (server instanceof JSONTestServer) {
                 port = 8887;
             }
 
-            server.open("127.0.0.1", port, dummyHandlers.generateServerEventsHandler());
-            logger.info("Server started on port: {}", port);
+            server.open(host, port, dummyHandlers.generateServerEventsHandler());
+            logger.info("Server started on host: {}, port: {}", host, port);
             isStarted = true;
         }
     }

diff --git a/ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/base/json/JSONBaseSpec.groovy b/ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/base/json/JSONBaseSpec.groovy
@@ -14,7 +14,7 @@ abstract class JSONBaseSpec extends Specification {
     FakeChargePoint chargePoint = new FakeChargePoint()
 
     def setupSpec() {
-        def conditions = new PollingConditions(timeout: 10)
+        def conditions = new PollingConditions(timeout: 11)
 
         // When a Central System is running
         centralSystem.started()
@@ -36,7 +36,7 @@ abstract class JSONBaseSpec extends Specification {
     }
 
     def cleanupSpec() {
-        def conditions = new PollingConditions(timeout: 10)
+        def conditions = new PollingConditions(timeout: 11)
 
         centralSystem.stopped()
 

diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/WebSocketTransmitter.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/WebSocketTransmitter.java
@@ -112,6 +112,9 @@ public void onError(Exception ex) {
         }
 
         configure();
+
+        logger.debug("Trying to connect to: {}", resource);
+
         try {
             client.connectBlocking();
             closed = false;