From 83c00a574dbaed179d969c918ae5855ac3c634ab Mon Sep 17 00:00:00 2001
From: Marten Seemann <martenseemann@gmail.com>
Date: Wed, 16 Aug 2023 21:21:48 +0700
Subject: [PATCH] ci: also run integration tests on Windows and macOS (#3987)

---
 .github/workflows/integration.yml       | 12 +++++++++---
 integrationtests/self/handshake_test.go |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index 7ad8f5ba..0b8fa904 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -5,12 +5,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        os: [ "ubuntu" ]
         go: [ "1.20.x", "1.21.x" ]
-    runs-on: ${{ fromJSON(vars['INTEGRATION_RUNNER_UBUNTU'] || '"ubuntu-latest"') }}
+        include:
+          - os: "windows"
+            go: "1.21.x"
+          - os: "macos"
+            go: "1.21.x"
+    runs-on: ${{ fromJSON(vars[format('INTEGRATION_RUNNER_{0}', matrix.os)] || format('"{0}-latest"', matrix.os)) }}
     env:
       DEBUG: false # set this to true to export qlogs and save them as artifacts
       TIMESCALE_FACTOR: 3
-    name: Integration Tests (Go ${{ matrix.go }})
+    name: Integration Tests (${{ matrix.os }}, Go ${{ matrix.go }})
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
@@ -37,7 +43,7 @@ jobs:
           QUIC_GO_ENABLE_GSO: true
         run: go run github.com/onsi/ginkgo/v2/ginkgo -r -v -randomize-all -randomize-suites -trace integrationtests/self -- -version=1 ${{ env.QLOGFLAG }}
       - name: Run tests (32 bit)
-        if: success() || failure() # run this step even if the previous one failed
+        if: ${{ matrix.os != 'macos' && (success() || failure()) }} # run this step even if the previous one failed
         env:
           GOARCH: 386
         run: |
diff --git a/integrationtests/self/handshake_test.go b/integrationtests/self/handshake_test.go
index cccff8a6..951c4c7a 100644
--- a/integrationtests/self/handshake_test.go
+++ b/integrationtests/self/handshake_test.go
@@ -453,7 +453,7 @@ var _ = Describe("Handshake tests", func() {
 
 		It("rejects invalid Retry token with the INVALID_TOKEN error", func() {
 			serverConfig.RequireAddressValidation = func(net.Addr) bool { return true }
-			serverConfig.MaxRetryTokenAge = time.Nanosecond
+			serverConfig.MaxRetryTokenAge = -time.Second
 
 			server, err := quic.ListenAddr("localhost:0", getTLSConfig(), serverConfig)
 			Expect(err).ToNot(HaveOccurred())