Try to fix windows

open-coap · Aug 30, 2023 · ae77c24 · ae77c24
1 parent 6a2af38
commit ae77c24
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ jobs:
       fail-fast: false
       matrix:
         java: [ '8', '11', '17' ]
-        platform: [ 'ubuntu-latest', 'macos-12', 'windows-latest' ]
+        platform: [  'windows-latest' ] # 'ubuntu-latest', 'macos-12',
         exclude:
           - platform: ${{ github.repository == 'open-coap/kotlin-mbedtls' || 'macos-12' }}
 

diff --git a/kotlin-mbedtls/src/test/kotlin/org/opencoap/ssl/transport/DtlsServerTest.kt b/kotlin-mbedtls/src/test/kotlin/org/opencoap/ssl/transport/DtlsServerTest.kt
@@ -115,12 +115,13 @@ class DtlsServerTest {
 
         assertEquals(1, dtlsServer.numberOfSessions)
 
-        val javaVersion = System.getProperty("java.version").split(".").first().toIntOrNull() ?: 0
-        println("Java version: $javaVersion")
-        println("OS: ${System.getProperty("os.name")}")
-        if (!(System.getProperty("os.name").startsWith("Windows") && javaVersion <= 11)) {
-            assertTrue(serverOutboundQueue.isEmpty())
+        var serverOutboundQueueIsEmpty = false
+        repeat(10) {
+            serverOutboundQueueIsEmpty = serverOutboundQueue.isEmpty()
+            Thread.sleep(500)
         }
+        assertTrue(serverOutboundQueueIsEmpty)
+
         clientSession.close()
     }
 
@@ -181,6 +182,7 @@ class DtlsServerTest {
         assertEquals("terve", dtlsServer.handleAndDecrypt(dtlsPacket))
 
         assertTrue(serverOutboundQueue.isEmpty())
+
         clientSession.close()
     }