From b2534295d5af4bdd440f6afa3043491000fe34c7 Mon Sep 17 00:00:00 2001 From: Martin Cardozo Date: Tue, 6 Jan 2026 14:14:51 -0300 Subject: [PATCH 1/2] Flaky tests isolated --- Split.xcodeproj/project.pbxproj | 6 + .../xcshareddata/xcschemes/Split.xcscheme | 3 + .../xcschemes/SplitTestsSwift5.xcscheme | 3 + .../xcschemes/SplitTestsSwift6.xcscheme | 3 + SplitFlakyTests.xctestplan | 536 +++ SplitiOSUnit_3.xctestplan | 3794 +++++++++-------- SplitiOSUnit_5.xctestplan | 82 +- 7 files changed, 2492 insertions(+), 1935 deletions(-) create mode 100644 SplitFlakyTests.xctestplan diff --git a/Split.xcodeproj/project.pbxproj b/Split.xcodeproj/project.pbxproj index 59b1eaed..15389d6c 100644 --- a/Split.xcodeproj/project.pbxproj +++ b/Split.xcodeproj/project.pbxproj @@ -827,6 +827,8 @@ 5BF52DF72DE0B60700FEDAFE /* PrerequisitesMatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BF52DF52DE0B60300FEDAFE /* PrerequisitesMatcher.swift */; }; 5BF52DF92DE4B8D400FEDAFE /* PrerequisitesMatcherTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BF52DF82DE4B8CA00FEDAFE /* PrerequisitesMatcherTest.swift */; }; 5BF52E032DE62F0500FEDAFE /* PrerequisitesMatcherMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BF52E022DE62EFE00FEDAFE /* PrerequisitesMatcherMock.swift */; }; + 5BFA8DDD2F0D7956004EAE86 /* SplitFlakyTests.xctestplan in Resources */ = {isa = PBXBuildFile; fileRef = 5BFA8DDC2F0D7956004EAE86 /* SplitFlakyTests.xctestplan */; }; + 5BFA8DDE2F0D7956004EAE86 /* SplitFlakyTests.xctestplan in Resources */ = {isa = PBXBuildFile; fileRef = 5BFA8DDC2F0D7956004EAE86 /* SplitFlakyTests.xctestplan */; }; 9500D9922C56F9BA00383593 /* HostDomainFilterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9500D9912C56F9BA00383593 /* HostDomainFilterTests.swift */; }; 9500D9A92C59297400383593 /* HostDomainFilter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9500D9A82C59297400383593 /* HostDomainFilter.swift */; }; 9500D9AA2C59382000383593 /* HostDomainFilter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9500D9A82C59297400383593 /* HostDomainFilter.swift */; }; @@ -2068,6 +2070,7 @@ 5BF52DF52DE0B60300FEDAFE /* PrerequisitesMatcher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrerequisitesMatcher.swift; sourceTree = ""; }; 5BF52DF82DE4B8CA00FEDAFE /* PrerequisitesMatcherTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrerequisitesMatcherTest.swift; sourceTree = ""; }; 5BF52E022DE62EFE00FEDAFE /* PrerequisitesMatcherMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrerequisitesMatcherMock.swift; sourceTree = ""; }; + 5BFA8DDC2F0D7956004EAE86 /* SplitFlakyTests.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = SplitFlakyTests.xctestplan; sourceTree = ""; }; 9500D9912C56F9BA00383593 /* HostDomainFilterTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HostDomainFilterTests.swift; sourceTree = ""; }; 9500D9A82C59297400383593 /* HostDomainFilter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HostDomainFilter.swift; sourceTree = ""; }; 9500D9AC2C5A918300383593 /* split_cache_v5.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = split_cache_v5.xcdatamodel; sourceTree = ""; }; @@ -2658,6 +2661,7 @@ 95DF58F72BEC5432009220B8 /* SplitiOSUnit_3.xctestplan */, 95DF58F92BEE513F009220B8 /* SplitiOSUnit_4.xctestplan */, 5BD75F822E5C9B5700F9EFBD /* SplitiOSUnit_5.xctestplan */, + 5BFA8DDC2F0D7956004EAE86 /* SplitFlakyTests.xctestplan */, 950F72FE292E8D6B008A0040 /* SplitiOSFull.xctestplan */, 3B6DEE5C20EA6A4E0067435E /* Split */, 592C6AA6211B6C99002D120C /* SplitTests */, @@ -4523,6 +4527,7 @@ 592C6AE9211CBBB0002D120C /* murmur3-sample-data-non-alpha-numeric-v2.csv in Resources */, 95F7BC072C1CE84500C5F2E4 /* rsa_4096_pub.der in Resources */, 95F7BC0D2C2A1F3700C5F2E4 /* ed25519-cert.der in Resources */, + 5BFA8DDE2F0D7956004EAE86 /* SplitFlakyTests.xctestplan in Resources */, 59FB7C2C2202467C00ECC96A /* localhost_2.splits in Resources */, 95F7BC152C346BB400C5F2E4 /* ec_256v1_cert.der in Resources */, 95F7BBEA2C1A3D4100C5F2E4 /* apple_public_key.pem in Resources */, @@ -4614,6 +4619,7 @@ 5B3C17B12ED76BAD0068D623 /* murmur3-sample-data-non-alpha-numeric-v2.csv in Resources */, 5B3C17B22ED76BAD0068D623 /* rsa_4096_pub.der in Resources */, 5B3C17B32ED76BAD0068D623 /* ed25519-cert.der in Resources */, + 5BFA8DDD2F0D7956004EAE86 /* SplitFlakyTests.xctestplan in Resources */, 5B3C17B42ED76BAD0068D623 /* localhost_2.splits in Resources */, 5B3C17B52ED76BAD0068D623 /* ec_256v1_cert.der in Resources */, 5B3C17B62ED76BAD0068D623 /* apple_public_key.pem in Resources */, diff --git a/Split.xcodeproj/xcshareddata/xcschemes/Split.xcscheme b/Split.xcodeproj/xcshareddata/xcschemes/Split.xcscheme index f999ca50..5f7fce78 100644 --- a/Split.xcodeproj/xcshareddata/xcschemes/Split.xcscheme +++ b/Split.xcodeproj/xcshareddata/xcschemes/Split.xcscheme @@ -89,6 +89,9 @@ + + + + + + Date: Tue, 6 Jan 2026 14:16:21 -0300 Subject: [PATCH 2/2] test_all.yml updated --- .github/workflows/test_all.yaml | 3 ++- SplitiOSUnit_5.xctestplan | 12 ++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test_all.yaml b/.github/workflows/test_all.yaml index 91d66e41..da92b26a 100644 --- a/.github/workflows/test_all.yaml +++ b/.github/workflows/test_all.yaml @@ -30,7 +30,8 @@ jobs: SplitiOSUnit_5, SemVer, SplitPushManagerUT, - SplitStreamingUT + SplitStreamingUT, + SplitFlakyTests ] scheme: [SplitTestsSwift5, SplitTestsSwift6] fail-fast: false diff --git a/SplitiOSUnit_5.xctestplan b/SplitiOSUnit_5.xctestplan index dc657609..11079f53 100644 --- a/SplitiOSUnit_5.xctestplan +++ b/SplitiOSUnit_5.xctestplan @@ -199,7 +199,11 @@ "SplitIntegrationTests\/testReadyMyLargeSegmentsEnabledNoWaitMls()", "SplitIntegrationTests\/testReadyMyLargeSegmentsEnabledWaitMls()", "SplitIntegrationTests\/testReadyNoRef()", - "StreamingControlTest\/testControl()" + "StreamingControlTest\/testControl()", + "TelemetryIntegrationTest\/testStreamingTelemetry()", + "UserConsentModeDebugTest\/testUserConsentGranted()", + "UserConsentModeNoneTest\/testUserConsentGranted()", + "UserConsentModeOptimizedTest\/testUserConsentGranted()" ], "target" : { "containerPath" : "container:Split.xcodeproj", @@ -395,7 +399,11 @@ "SplitIntegrationTests\/testReadyMyLargeSegmentsEnabledNoWaitMls()", "SplitIntegrationTests\/testReadyMyLargeSegmentsEnabledWaitMls()", "SplitIntegrationTests\/testReadyNoRef()", - "StreamingControlTest\/testControl()" + "StreamingControlTest\/testControl()", + "TelemetryIntegrationTest\/testStreamingTelemetry()", + "UserConsentModeDebugTest\/testUserConsentGranted()", + "UserConsentModeNoneTest\/testUserConsentGranted()", + "UserConsentModeOptimizedTest\/testUserConsentGranted()" ], "target" : { "containerPath" : "container:Split.xcodeproj",