More agressive test skipping for tests that have structured concurren…

…cy side effects
duckduckgo · Nov 21, 2024 · 605e423 · 605e423
1 parent 96188f6
commit 605e423
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/DuckDuckGoTests/ContextualDaxDialogsFactoryTests.swift b/DuckDuckGoTests/ContextualDaxDialogsFactoryTests.swift
@@ -32,6 +32,7 @@ final class ContextualDaxDialogsFactoryTests: XCTestCase {
     private var window: UIWindow!
 
     override func setUpWithError() throws {
+        throw XCTSkip("Potentially flaky")
         try super.setUpWithError()
         delegate = ContextualOnboardingDelegateMock()
         settingsMock = ContextualOnboardingSettingsMock()
@@ -48,7 +49,7 @@ final class ContextualDaxDialogsFactoryTests: XCTestCase {
     }
 
     override func tearDownWithError() throws {
-        window.isHidden = true
+        window?.isHidden = true
         window = nil
         delegate = nil
         settingsMock = nil

diff --git a/DuckDuckGoTests/ContextualOnboardingNewTabDialogFactoryTests.swift b/DuckDuckGoTests/ContextualOnboardingNewTabDialogFactoryTests.swift
@@ -33,8 +33,9 @@ class ContextualOnboardingNewTabDialogFactoryTests: XCTestCase {
     var onDismissCalled: Bool!
     var window: UIWindow!
 
-    override func setUp() {
-        super.setUp()
+    override func setUpWithError() throws {
+        throw XCTSkip("Potentially flaky")
+        try super.setUpWithError()
         mockDelegate = CapturingOnboardingNavigationDelegate()
         contextualOnboardingLogicMock = ContextualOnboardingLogicMock()
         onboardingManagerMock = OnboardingManagerMock()
@@ -51,7 +52,7 @@ class ContextualOnboardingNewTabDialogFactoryTests: XCTestCase {
     }
 
     override func tearDown() {
-        window.isHidden = true
+        window?.isHidden = true
         window = nil
         factory = nil
         mockDelegate = nil

diff --git a/DuckDuckGoTests/NetworkProtectionStatusViewModelTests.swift b/DuckDuckGoTests/NetworkProtectionStatusViewModelTests.swift
@@ -35,8 +35,9 @@ final class NetworkProtectionStatusViewModelTests: XCTestCase {
         return NEVPNError(_nsError: nsError)
     }
 
-    override func setUp() {
-        super.setUp()
+    override func setUpWithError() throws {
+        throw XCTSkip("Potentially flaky")
+        try super.setUpWithError()
         tunnelController = MockTunnelController()
         statusObserver = MockConnectionStatusObserver()
         serverInfoObserver = MockConnectionServerInfoObserver()

diff --git a/DuckDuckGoTests/OnboardingNavigationDelegateTests.swift b/DuckDuckGoTests/OnboardingNavigationDelegateTests.swift
@@ -35,7 +35,9 @@ final class OnboardingNavigationDelegateTests: XCTestCase {
     var mainVC: MainViewController!
     var onboardingPixelReporter: OnboardingPixelReporterMock!
 
-    override func setUp() {
+    override func setUpWithError() throws {
+        throw XCTSkip("Potentially flaky")
+        try super.setUpWithError()
         let db = CoreDataDatabase.bookmarksMock
         let bookmarkDatabaseCleaner = BookmarkDatabaseCleaner(bookmarkDatabase: db, errorEvents: nil)
         let dataProviders = SyncDataProviders(