Add ability to override 'timeout' via --user-options (#116)

sergiikhliustin · Feb 29, 2024 · c16fd2f · c16fd2f
1 parent e5bb686
commit c16fd2f
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -104,6 +104,7 @@ OPTIONS:
                           For test specs:
                           'SomePod/UnitTests.runner := //:SomeTestsRunner'
                           'SomePod/UnitTests.test_host := //:SomeTestHostApp'
+                          'SomePod/UnitTests.timeout := eternal'
   --deps-prefix <deps-prefix>
                           Dependencies prefix (default: //Pods)
   --pods-root <pods-root> Pods root relative to workspace. Used for headers search paths (default: Pods)
@@ -148,6 +149,7 @@ OPTIONS:
                           For test specs:
                           'SomePod/UnitTests.runner := //:SomeTestsRunner'
                           'SomePod/UnitTests.test_host := //:SomeTestHostApp'
+                          'SomePod/UnitTests.timeout := eternal'
   --deps-prefix <deps-prefix>
                           Dependencies prefix (default: //Pods)
   --pods-root <pods-root> Pods root relative to workspace. Used for headers search paths (default: Pods)

diff --git a/Sources/BazelPods/BazelPods.swift b/Sources/BazelPods/BazelPods.swift
@@ -141,6 +141,7 @@ Platform specific:
 For test specs:
 'SomePod/UnitTests.runner := //:SomeTestsRunner'
 'SomePod/UnitTests.test_host := //:SomeTestHostApp'
+'SomePod/UnitTests.timeout := eternal'
 """
         )
         var userOptions: [String] = []

diff --git a/Sources/BazelPodsCore/Analyzer/TestSpec/RunnerAnalyzer.swift b/Sources/BazelPodsCore/Analyzer/TestSpec/RunnerAnalyzer.swift
@@ -11,6 +11,7 @@ struct RunnerAnalyzer<S: SchemeRepresentable> {
     struct Result {
         var runnerName: String?
         var testHost: String?
+        var timeout: TestsTimeout?
     }
 
     private let spec: S
@@ -29,7 +30,8 @@ struct RunnerAnalyzer<S: SchemeRepresentable> {
     private func run() -> Result {
         return Result(
             runnerName: nil,
-            testHost: nil
+            testHost: nil,
+            timeout: nil
         )
     }
 }
diff --git a/Sources/BazelPodsCore/Build/PodBuildFile+makeTestspecs.swift b/Sources/BazelPodsCore/Build/PodBuildFile+makeTestspecs.swift
@@ -74,7 +74,7 @@ extension PodBuildFile {
                         sources: analyzer.sourcesInfo,
                         resources: analyzer.resourcesInfo,
                         deps: deps,
-                        timeout: options.testsTimeout?.rawValue ?? "",
+                        timeout: analyzer.runnerInfo.timeout?.rawValue ?? options.testsTimeout?.rawValue ?? "",
                         testHost: testHost,
                         infoPlist: infoPlist.name,
                         environment: analyzer.environmentInfo.environmentVariables,
@@ -88,7 +88,7 @@ extension PodBuildFile {
                         sources: analyzer.sourcesInfo,
                         resources: analyzer.resourcesInfo,
                         deps: deps,
-                        timeout: options.testsTimeout?.rawValue ?? "",
+                        timeout: analyzer.runnerInfo.timeout?.rawValue ?? options.testsTimeout?.rawValue ?? "",
                         testHost: testHost,
                         infoPlist: infoPlist.name,
                         environment: analyzer.environmentInfo.environmentVariables,

diff --git a/Sources/BazelPodsCore/Core/UserOption.swift b/Sources/BazelPodsCore/Core/UserOption.swift
@@ -55,6 +55,7 @@ public struct UserOption {
         case link_dynamic(Bool)
         case runner(String)
         case test_host(String)
+        case timeout(TestsTimeout)
     }
     public enum KeyPath: String, CaseIterable {
         case sdk_frameworks
@@ -67,6 +68,7 @@ public struct UserOption {
         case link_dynamic
         case runner
         case test_host
+        case timeout
     }
 
     public init?(_ string: String) {
@@ -195,6 +197,22 @@ public struct UserOption {
                 return nil
             }
             attribute = .test_host(last)
+        case .timeout:
+            guard opt == .replace else {
+                log_error("Incorrect option for \(string). '\(keyPath)' supports only \(Opt.replace.rawValue) operator. Skipping...")
+                return nil
+            }
+            guard
+                value.count == 1,
+                let last = value.last?.trim,
+                let timeout = TestsTimeout(rawValue: last)
+            else {
+                log_error(
+                    "Incorrect value for \(string). Should be one of \(TestsTimeout.allCases.map({ $0.rawValue }).joined(separator: ", "))). Skipping..."
+                )
+                return nil
+            }
+            attribute = .timeout(timeout)
         }
         self.name = name
         self.opt = opt

diff --git a/Sources/BazelPodsCore/Patches/UserOptionsPatch.swift b/Sources/BazelPodsCore/Patches/UserOptionsPatch.swift
@@ -88,6 +88,9 @@ struct UserOptionsPatch: Patch, TestSpecSpecificPatch {
             case .test_host:
                 // test spec specific option
                 break
+            case .timeout:
+                // test spec specific option
+                break
             }
         }
     }
@@ -117,6 +120,8 @@ struct UserOptionsPatch: Patch, TestSpecSpecificPatch {
                 runnerInfo.runnerName = string
             case .test_host(let string):
                 runnerInfo.testHost = string
+            case .timeout(let timeout):
+                runnerInfo.timeout = timeout
             default:
                 break
             }