Spurious CI failure etc. (#55)

* Spurious CI failure etc. --------- Co-authored-by: Tilmann Zäschke <tilmann.zaeschke@inf.ethz.ch>
scionproto-contrib · Apr 29, 2024 · 10cbe4c · 10cbe4c
1 parent 49fc193
commit 10cbe4c
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -72,6 +72,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
   [#50](https://github.com/netsec-ethz/scion-java-client/pull/50)
 - Fix `Unsupported platform: protoc-3.11.4-osx-aarch_64.exe.`
   [#53](https://github.com/netsec-ethz/scion-java-client/pull/53)
+- Fixed spurious CI failure and SimpleCache packet name.
+  [#55](https://github.com/netsec-ethz/scion-java-client/pull/55)
 
 ### Removed
 - Removed all code related to DatagramSockets

diff --git a/src/main/java/org/scion/jpan/ScionService.java b/src/main/java/org/scion/jpan/ScionService.java
@@ -36,11 +36,11 @@
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
-import org.scion.internal.SimpleCache;
 import org.scion.jpan.internal.DNSHelper;
 import org.scion.jpan.internal.HostsFileParser;
 import org.scion.jpan.internal.ScionBootstrapper;
 import org.scion.jpan.internal.Segments;
+import org.scion.jpan.internal.SimpleCache;
 import org.scion.jpan.proto.control_plane.SegmentLookupServiceGrpc;
 import org.scion.jpan.proto.daemon.Daemon;
 import org.scion.jpan.proto.daemon.DaemonServiceGrpc;

diff --git a/src/main/java/org/scion/jpan/internal/SimpleCache.java b/src/main/java/org/scion/jpan/internal/SimpleCache.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.scion.internal;
+package org.scion.jpan.internal;
 
 import java.util.HashMap;
 import java.util.TreeMap;

diff --git a/src/test/java/org/scion/jpan/api/SCMPTest.java b/src/test/java/org/scion/jpan/api/SCMPTest.java
@@ -113,7 +113,7 @@ private void testEcho(Supplier<RequestPath> path) throws IOException {
       assertEquals(42, result.getSequenceNumber());
       assertEquals(Scmp.TypeCode.TYPE_129, result.getTypeCode());
       assertTrue(result.getNanoSeconds() > 0);
-      assertTrue(result.getNanoSeconds() < 10_000_000); // 10 ms
+      assertTrue(result.getNanoSeconds() < 100_000_000); // 10 ms
       assertArrayEquals(data, result.getData());
       assertFalse(result.isTimedOut());
     } finally {

diff --git a/src/test/java/org/scion/jpan/internal/SimpleCacheTest.java b/src/test/java/org/scion/jpan/internal/SimpleCacheTest.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.scion.internal;
+package org.scion.jpan.internal;
 
 import static org.junit.jupiter.api.Assertions.*;
 

diff --git a/src/test/java/org/scion/jpan/testutil/PingPongHelperBase.java b/src/test/java/org/scion/jpan/testutil/PingPongHelperBase.java
@@ -79,6 +79,7 @@ public void runPingPong(ServerFactory serverFactory, ClientFactory clientFactory
         servers[i].setName("Server-thread-" + i);
         servers[i].start();
       }
+      Thread.sleep(100); // Wait for server(s) to start
 
       Thread[] clients = new Thread[nClients];
       for (int i = 0; i < clients.length; i++) {