From d0b92323496c602ac4bb6b1da9195e459420026f Mon Sep 17 00:00:00 2001 From: Binbin Date: Wed, 14 Aug 2024 21:56:49 +0800 Subject: [PATCH] Skip IPv6 tests on MacOS In #786, we did skip it in the daily, but not for the others. When running ./runtest on MacOS, we will get the failure. ``` couldn't open socket: host is unreachable (nodename nor servname provided, or not known) ``` This PR moves the skip logic from tags -ipv6 to TCL uname. This also revert #786. Signed-off-by: Binbin --- .github/workflows/daily.yml | 2 +- tests/unit/cluster/announce-client-ip.tcl | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index 2d7a4e5f86..db135a9897 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -938,7 +938,7 @@ jobs: run: make SERVER_CFLAGS='-Werror' - name: test if: true && !contains(github.event.inputs.skiptests, 'valkey') - run: ./runtest --accurate --verbose --tags -ipv6 --clients 1 --no-latency --dump-logs ${{github.event.inputs.test_args}} + run: ./runtest --accurate --verbose --clients 1 --no-latency --dump-logs ${{github.event.inputs.test_args}} - name: module api test if: true && !contains(github.event.inputs.skiptests, 'modules') run: CFLAGS='-Werror' ./runtest-moduleapi --verbose --clients 1 --no-latency --dump-logs ${{github.event.inputs.test_args}} diff --git a/tests/unit/cluster/announce-client-ip.tcl b/tests/unit/cluster/announce-client-ip.tcl index f0aebd0807..bc36892db6 100644 --- a/tests/unit/cluster/announce-client-ip.tcl +++ b/tests/unit/cluster/announce-client-ip.tcl @@ -68,6 +68,7 @@ start_cluster 2 2 {tags {external:skip cluster} overrides {cluster-replica-no-fa } } +if {![string match {*Darwin*} [exec uname -a]]} { start_cluster 2 2 {tags {external:skip cluster ipv6} overrides {cluster-replica-no-failover yes bind {127.0.0.1 ::1}}} { # Connecting to localhost as "::1" makes the clients use IPv6. set clients {} @@ -147,3 +148,4 @@ start_cluster 2 2 {tags {external:skip cluster ipv6} overrides {cluster-replica- [lindex $clients $j] close } } +} ;# if uname \ No newline at end of file