Update actions and early start selector thread for test

ibauersachs · ibauersachs · commit ea51f46ca3dd · 2021-04-13T23:04:47.000+02:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -33,16 +33,18 @@ jobs:
           fetch-depth: 0
 
       - name: Cache Maven dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
-          path: ~/.m2
+          path: ~/.m2/repository
           key: m2-cache-${{ matrix.java }}-${{ matrix.arch }}-${{ matrix.os }}
 
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
           java-version: ${{ matrix.java }}
           architecture: ${{ matrix.arch }}
+          distribution: zulu
+          check-latest: true
 
       - name: Build with Maven
         if: "${{ !(matrix.arch == 'x64' && matrix.os == 'ubuntu-20.04' && matrix.java == '11') || github.event.pull_request.head.repo.full_name != 'dnsjava/dnsjava' }}"
@@ -65,19 +67,20 @@ jobs:
     needs: test
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
 
       - name: Cache Maven dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v2
         with:
-          path: ~/.m2
+          path: ~/.m2/repository
           key: m2-cache-8-x64-ubuntu-20.04
 
       - name: Set up JDK 8
-        uses: joschi/setup-jdk@e87a7cec853d2dd7066adf837fe12bf0f3d45e52
+        uses: actions/setup-java@v2
         with:
           java-version: '8'
           architecture: 'x64'
+          distribution: zulu
           server-id: ossrh
           server-username: SONATYPE_USER
           server-password: SONATYPE_PW
diff --git a/src/test/java/org/xbill/DNS/NioTcpClientTest.java b/src/test/java/org/xbill/DNS/NioTcpClientTest.java
@@ -20,8 +20,12 @@
 public class NioTcpClientTest {
   @Test
   void testResponseStream() throws InterruptedException, IOException {
+    // start the selector thread early
+    Client.selector();
+
     Record qr = Record.newRecord(Name.fromConstantString("example.com."), Type.A, DClass.IN);
     Message[] q = new Message[] {Message.newQuery(qr), Message.newQuery(qr)};
+    CountDownLatch cdlServerThreadStart = new CountDownLatch(1);
     CountDownLatch cdl1 = new CountDownLatch(q.length);
     CountDownLatch cdl2 = new CountDownLatch(q.length);
     Message[] serverReceivedMessages = new Message[q.length];
@@ -33,6 +37,7 @@ void testResponseStream() throws InterruptedException, IOException {
         new Thread(
             () -> {
               try {
+                cdlServerThreadStart.countDown();
                 s[0] = ss.accept();
                 while (cdl1.getCount() > 0) {
                   int ii = i.getAndIncrement();
@@ -56,6 +61,10 @@ void testResponseStream() throws InterruptedException, IOException {
             });
     server.start();
 
+    if (!cdlServerThreadStart.await(5, TimeUnit.SECONDS)) {
+      fail("timed out waiting for server thread to start");
+    }
+
     for (int j = 0; j < q.length; j++) {
       int jj = j;
       NioTcpClient.sendrecv(
