From 92c68568edb1d68ea13e59f9787012d839969e13 Mon Sep 17 00:00:00 2001 From: Jose Date: Mon, 4 Nov 2024 18:24:07 +0100 Subject: [PATCH 1/3] Disable IPv6 for C# Ice/adapterDeactivation --- scripts/tests/Ice/adapterDeactivation.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/tests/Ice/adapterDeactivation.py b/scripts/tests/Ice/adapterDeactivation.py index e99077122f6..d983bf31eef 100644 --- a/scripts/tests/Ice/adapterDeactivation.py +++ b/scripts/tests/Ice/adapterDeactivation.py @@ -3,7 +3,10 @@ # Copyright (c) ZeroC, Inc. All rights reserved. # -from Util import TestSuite +from Util import CSharpMapping, Darwin, TestSuite, platform, Mapping +# Disable IPv6 for macOS until https://github.com/dotnet/runtime/pull/108334 is merged in .NET 8 +# See https://github.com/zeroc-ice/ice/issues/2061 +ipv6 = not (isinstance(Mapping.getByPath(__name__), CSharpMapping) and isinstance(platform, Darwin)) -TestSuite(__name__, multihost=False) +TestSuite(__name__, multihost=False, options={"ipv6": [ipv6]}) From 515f4f8a93e56e6307500d56120959a478ebf335 Mon Sep 17 00:00:00 2001 From: Jose Date: Mon, 4 Nov 2024 19:46:41 +0100 Subject: [PATCH 2/3] Enable test --- .github/workflows/ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6569f1f8102..bf89b46c772 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,8 +23,6 @@ jobs: # Release builds - os: macos-15 config: "release" - # https://github.com/zeroc-ice/ice/issues/2061 - test_flags: "--rfilter=csharp/Ice/adapterDeactivation" - os: ubuntu-24.04 config: "release" - os: windows-2022 @@ -43,7 +41,7 @@ jobs: config: "debug" build_flags: "OPTIMIZE=no" # https://github.com/zeroc-ice/ice/issues/2061 - test_flags: "--swift-config=debug --rfilter=csharp/Ice/adapterDeactivation" + test_flags: "--swift-config=debug" - os: ubuntu-24.04 config: "debug" build_flags: "OPTIMIZE=no" From 93ad157df510d603cc77b3fd896cd044d75855cc Mon Sep 17 00:00:00 2001 From: Jose Date: Tue, 5 Nov 2024 09:56:27 +0100 Subject: [PATCH 3/3] Review fixes --- .github/workflows/ci.yml | 1 - scripts/Util.py | 7 ++++--- scripts/tests/Ice/adapterDeactivation.py | 8 +++++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bf89b46c772..027c061cf28 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,7 +40,6 @@ jobs: - os: macos-15 config: "debug" build_flags: "OPTIMIZE=no" - # https://github.com/zeroc-ice/ice/issues/2061 test_flags: "--swift-config=debug" - os: ubuntu-24.04 config: "debug" diff --git a/scripts/Util.py b/scripts/Util.py index 5306555c4c7..2f77aa1f4c7 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -867,11 +867,12 @@ def getProps(self, process, current): props["Ice.Override.Compress"] = "1" if self.serialize: props["Ice.ThreadPool.Server.Serialize"] = "1" - # JavaScript does not support the Ice.IPv6 property + if not isinstance(current.testsuite.getMapping(), JavaScriptMapping): + # JavaScript does not support the IPv6 properties props["Ice.IPv6"] = self.ipv6 - if self.ipv6: - props["Ice.PreferIPv6Address"] = True + if self.ipv6: + props["Ice.PreferIPv6Address"] = True if self.mx: props["Ice.Admin.Endpoints"] = ( 'tcp -h "::1"' if self.ipv6 else "tcp -h 127.0.0.1" diff --git a/scripts/tests/Ice/adapterDeactivation.py b/scripts/tests/Ice/adapterDeactivation.py index d983bf31eef..e2bd7a8e1b9 100644 --- a/scripts/tests/Ice/adapterDeactivation.py +++ b/scripts/tests/Ice/adapterDeactivation.py @@ -5,8 +5,10 @@ from Util import CSharpMapping, Darwin, TestSuite, platform, Mapping -# Disable IPv6 for macOS until https://github.com/dotnet/runtime/pull/108334 is merged in .NET 8 +options = {} +# Disable IPv6 for .NET on macOS until https://github.com/dotnet/runtime/pull/108334 is merged in .NET 8 # See https://github.com/zeroc-ice/ice/issues/2061 -ipv6 = not (isinstance(Mapping.getByPath(__name__), CSharpMapping) and isinstance(platform, Darwin)) +if (isinstance(Mapping.getByPath(__name__), CSharpMapping) and isinstance(platform, Darwin)): + options = {"ipv6": [False]} -TestSuite(__name__, multihost=False, options={"ipv6": [ipv6]}) +TestSuite(__name__, multihost=False, options=options)