Flank · mergify · Aug 24, 2020 · Aug 22, 2020 · Aug 24, 2020
diff --git a/test_runner/src/main/kotlin/ftl/Main.kt b/test_runner/src/main/kotlin/ftl/Main.kt
@@ -12,7 +12,7 @@ import ftl.cli.firebase.test.ProvidedSoftwareCommand
 import ftl.log.setDebugLogging
 import ftl.util.readRevision
 import ftl.util.readVersion
-import ftl.util.withGlobalExceptionHandling
+import ftl.run.exception.withGlobalExceptionHandling
 import picocli.CommandLine
 
 @CommandLine.Command(

diff --git a/test_runner/src/main/kotlin/ftl/args/ArgsFileVisitor.kt b/test_runner/src/main/kotlin/ftl/args/ArgsFileVisitor.kt
@@ -1,6 +1,6 @@
 package ftl.args
 
-import ftl.util.FlankGeneralError
+import ftl.run.exception.FlankGeneralError
 import java.io.IOException
 import java.nio.file.FileSystems
 import java.nio.file.FileVisitOption

diff --git a/test_runner/src/main/kotlin/ftl/args/ArgsHelper.kt b/test_runner/src/main/kotlin/ftl/args/ArgsHelper.kt
@@ -24,8 +24,8 @@ import ftl.shard.StringShards
 import ftl.shard.createShardsByShardCount
 import ftl.shard.shardCountByTime
 import ftl.shard.stringShards
-import ftl.util.FlankConfigurationError
-import ftl.util.FlankGeneralError
+import ftl.run.exception.FlankConfigurationError
+import ftl.run.exception.FlankGeneralError
 import ftl.util.FlankTestMethod
 import ftl.util.assertNotEmpty
 import java.io.File

diff --git a/test_runner/src/main/kotlin/ftl/args/IosArgs.kt b/test_runner/src/main/kotlin/ftl/args/IosArgs.kt
@@ -2,7 +2,7 @@ package ftl.args
 
 import com.google.common.annotations.VisibleForTesting
 import ftl.ios.Xctestrun.findTestNames
-import ftl.util.FlankConfigurationError
+import ftl.run.exception.FlankConfigurationError
 import ftl.util.FlankTestMethod
 
 data class IosArgs(

diff --git a/test_runner/src/main/kotlin/ftl/args/ValidateAndroidArgs.kt b/test_runner/src/main/kotlin/ftl/args/ValidateAndroidArgs.kt
@@ -7,8 +7,8 @@ import ftl.android.UnsupportedModelId
 import ftl.android.UnsupportedVersionId
 import ftl.config.containsPhysicalDevices
 import ftl.config.containsVirtualDevices
-import ftl.util.FlankConfigurationError
-import ftl.util.IncompatibleTestDimensionError
+import ftl.run.exception.FlankConfigurationError
+import ftl.run.exception.IncompatibleTestDimensionError
 import java.io.File
 
 fun AndroidArgs.validate() {

diff --git a/test_runner/src/main/kotlin/ftl/args/ValidateCommonArgs.kt b/test_runner/src/main/kotlin/ftl/args/ValidateCommonArgs.kt
@@ -2,8 +2,8 @@ package ftl.args
 
 import ftl.config.Device
 import ftl.config.FtlConstants
-import ftl.util.FlankConfigurationError
-import ftl.util.FlankGeneralError
+import ftl.run.exception.FlankConfigurationError
+import ftl.run.exception.FlankGeneralError
 
 fun CommonArgs.validate() {
     assertProjectId()

diff --git a/test_runner/src/main/kotlin/ftl/args/ValidateIosArgs.kt b/test_runner/src/main/kotlin/ftl/args/ValidateIosArgs.kt
@@ -1,8 +1,8 @@
 package ftl.args
 
 import ftl.ios.IosCatalog
-import ftl.util.FlankConfigurationError
-import ftl.util.IncompatibleTestDimensionError
+import ftl.run.exception.FlankConfigurationError
+import ftl.run.exception.IncompatibleTestDimensionError
 
 fun IosArgs.validate() {
     assertXcodeSupported()

diff --git a/test_runner/src/main/kotlin/ftl/args/yml/YamlDeprecated.kt b/test_runner/src/main/kotlin/ftl/args/yml/YamlDeprecated.kt
@@ -9,8 +9,8 @@ import com.fasterxml.jackson.databind.node.ObjectNode
 import com.google.common.annotations.VisibleForTesting
 import ftl.args.ArgsHelper.yamlMapper
 import ftl.util.loadFile
-import ftl.util.FlankConfigurationError
-import ftl.util.FlankGeneralError
+import ftl.run.exception.FlankConfigurationError
+import ftl.run.exception.FlankGeneralError
 import java.io.Reader
 import java.nio.file.Files
 import java.nio.file.Path

diff --git a/test_runner/src/main/kotlin/ftl/args/yml/YamlErrorConverter.kt b/test_runner/src/main/kotlin/ftl/args/yml/YamlErrorConverter.kt
@@ -5,7 +5,7 @@ package ftl.args.yml
 import com.fasterxml.jackson.databind.JsonNode
 import com.fasterxml.jackson.dataformat.yaml.snakeyaml.error.MarkedYAMLException
 import ftl.args.yml.errors.ConfigurationErrorMessageBuilder
-import ftl.util.FlankConfigurationError
+import ftl.run.exception.FlankConfigurationError
 
 fun convertConfigurationErrorExceptions(missingParameterError: Exception, yaml: JsonNode?): Throwable {
     val errorMessageBuilder = ConfigurationErrorMessageBuilder

diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/CommandUtil.kt b/test_runner/src/main/kotlin/ftl/cli/firebase/test/CommandUtil.kt
@@ -1,7 +1,7 @@
 package ftl.cli.firebase.test
 
 import ftl.args.yml.YamlDeprecated
-import ftl.util.YmlValidationError
+import ftl.run.exception.YmlValidationError
 import java.nio.file.Path
 
 fun processValidation(validationResult: String, shouldFix: Boolean, ymlPath: Path) {

diff --git a/.../main/kotlin/ftl/cli/firebase/test/android/configuration/AndroidLocalesDescribeCommand.kt b/.../main/kotlin/ftl/cli/firebase/test/android/configuration/AndroidLocalesDescribeCommand.kt
@@ -3,7 +3,7 @@ package ftl.cli.firebase.test.android.configuration
 import ftl.android.AndroidCatalog.getLocaleDescription
 import ftl.args.AndroidArgs
 import ftl.config.FtlConstants
-import ftl.util.FlankConfigurationError
+import ftl.run.exception.FlankConfigurationError
 import picocli.CommandLine
 import java.nio.file.Paths
 

diff --git a/...unner/src/main/kotlin/ftl/cli/firebase/test/android/models/AndroidModelDescribeCommand.kt b/...unner/src/main/kotlin/ftl/cli/firebase/test/android/models/AndroidModelDescribeCommand.kt
@@ -3,7 +3,7 @@ package ftl.cli.firebase.test.android.models
 import ftl.android.AndroidCatalog
 import ftl.args.AndroidArgs
 import ftl.config.FtlConstants
-import ftl.util.FlankConfigurationError
+import ftl.run.exception.FlankConfigurationError
 import picocli.CommandLine
 import java.nio.file.Paths
 

diff --git a/.../src/main/kotlin/ftl/cli/firebase/test/android/versions/AndroidVersionsDescribeCommand.kt b/.../src/main/kotlin/ftl/cli/firebase/test/android/versions/AndroidVersionsDescribeCommand.kt
@@ -3,7 +3,7 @@ package ftl.cli.firebase.test.android.versions
 import ftl.android.AndroidCatalog
 import ftl.args.AndroidArgs
 import ftl.config.FtlConstants
-import ftl.util.FlankConfigurationError
+import ftl.run.exception.FlankConfigurationError
 import picocli.CommandLine
 import java.nio.file.Paths
 

diff --git a/...nner/src/main/kotlin/ftl/cli/firebase/test/ios/configuration/IosLocalesDescribeCommand.kt b/...nner/src/main/kotlin/ftl/cli/firebase/test/ios/configuration/IosLocalesDescribeCommand.kt
@@ -3,7 +3,7 @@ package ftl.cli.firebase.test.ios.configuration
 import ftl.args.IosArgs
 import ftl.config.FtlConstants
 import ftl.ios.IosCatalog.getLocaleDescription
-import ftl.util.FlankConfigurationError
+import ftl.run.exception.FlankConfigurationError
 import picocli.CommandLine
 import java.nio.file.Paths
 

diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/models/IosModelDescribeCommand.kt b/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/models/IosModelDescribeCommand.kt
@@ -3,7 +3,7 @@ package ftl.cli.firebase.test.ios.models
 import ftl.args.IosArgs
 import ftl.config.FtlConstants
 import ftl.ios.IosCatalog
-import ftl.util.FlankConfigurationError
+import ftl.run.exception.FlankConfigurationError
 import picocli.CommandLine
 import java.nio.file.Paths
 

diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/versions/IosVersionsDescribeCommand.kt b/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/versions/IosVersionsDescribeCommand.kt
@@ -3,7 +3,7 @@ package ftl.cli.firebase.test.ios.versions
 import ftl.args.IosArgs
 import ftl.config.FtlConstants
 import ftl.ios.IosCatalog
-import ftl.util.FlankConfigurationError
+import ftl.run.exception.FlankConfigurationError
 import picocli.CommandLine
 import java.nio.file.Paths
 

diff --git a/...r/src/main/kotlin/ftl/cli/firebase/test/networkprofiles/NetworkProfilesDescribeCommand.kt b/...r/src/main/kotlin/ftl/cli/firebase/test/networkprofiles/NetworkProfilesDescribeCommand.kt
@@ -1,7 +1,7 @@
 package ftl.cli.firebase.test.networkprofiles
 
 import ftl.environment.networkProfileDescription
-import ftl.util.FlankConfigurationError
+import ftl.run.exception.FlankConfigurationError
 import picocli.CommandLine
 
 @CommandLine.Command(

diff --git a/test_runner/src/main/kotlin/ftl/config/FtlConstants.kt b/test_runner/src/main/kotlin/ftl/config/FtlConstants.kt
@@ -16,8 +16,8 @@ import ftl.args.IosArgs
 import ftl.gc.UserAuth
 import ftl.http.HttpTimeoutIncrease
 import ftl.util.BugsnagInitHelper.initBugsnag
-import ftl.util.FlankConfigurationError
-import ftl.util.FlankGeneralError
+import ftl.run.exception.FlankConfigurationError
+import ftl.run.exception.FlankGeneralError
 import ftl.util.readRevision
 import java.io.IOException
 import java.nio.file.Path

diff --git a/test_runner/src/main/kotlin/ftl/doctor/Doctor.kt b/test_runner/src/main/kotlin/ftl/doctor/Doctor.kt
@@ -7,7 +7,7 @@ import ftl.args.ArgsHelper
 import ftl.args.IArgs
 import ftl.config.loadAndroidConfig
 import ftl.config.loadIosConfig
-import ftl.util.FlankConfigurationError
+import ftl.run.exception.FlankConfigurationError
 import ftl.util.loadFile
 import java.io.Reader
 import java.lang.StringBuilder

diff --git a/test_runner/src/main/kotlin/ftl/environment/LocalesDescription.kt b/test_runner/src/main/kotlin/ftl/environment/LocalesDescription.kt
@@ -1,7 +1,7 @@
 package ftl.environment
 
 import com.google.api.services.testing.model.Locale
-import ftl.util.FlankGeneralError
+import ftl.run.exception.FlankGeneralError
 
 fun List<Locale>.getLocaleDescription(localeId: String) = findLocales(localeId)?.prepareDescription().orErrorMessage(localeId).plus("\n")
 

diff --git a/test_runner/src/main/kotlin/ftl/environment/android/AndroidModelDescription.kt b/test_runner/src/main/kotlin/ftl/environment/android/AndroidModelDescription.kt
@@ -1,7 +1,7 @@
 package ftl.environment.android
 
 import com.google.api.services.testing.model.AndroidModel
-import ftl.util.FlankGeneralError
+import ftl.run.exception.FlankGeneralError
 
 fun List<AndroidModel>.getDescription(modelId: String) = findModel(modelId)?.prepareDescription().orErrorMessage(modelId)
 

diff --git a/test_runner/src/main/kotlin/ftl/environment/android/AndroidSoftwareVersionDescription.kt b/test_runner/src/main/kotlin/ftl/environment/android/AndroidSoftwareVersionDescription.kt
@@ -1,7 +1,7 @@
 package ftl.environment.android
 
 import com.google.api.services.testing.model.AndroidVersion
-import ftl.util.FlankGeneralError
+import ftl.run.exception.FlankGeneralError
 
 fun List<AndroidVersion>.getDescription(versionId: String) = findVersion(versionId)?.prepareDescription().orErrorMessage(versionId)
 

diff --git a/test_runner/src/main/kotlin/ftl/environment/ios/IosModelDescription.kt b/test_runner/src/main/kotlin/ftl/environment/ios/IosModelDescription.kt
@@ -1,7 +1,7 @@
 package ftl.environment.ios
 
 import com.google.api.services.testing.model.IosModel
-import ftl.util.FlankGeneralError
+import ftl.run.exception.FlankGeneralError
 
 fun List<IosModel>.getDescription(modelId: String) = findModel(modelId)?.prepareDescription().orErrorMessage(modelId)
 

diff --git a/test_runner/src/main/kotlin/ftl/environment/ios/IosSoftwareVersionDescription.kt b/test_runner/src/main/kotlin/ftl/environment/ios/IosSoftwareVersionDescription.kt
@@ -1,7 +1,7 @@
 package ftl.environment.ios
 
 import com.google.api.services.testing.model.IosVersion
-import ftl.util.FlankGeneralError
+import ftl.run.exception.FlankGeneralError
 
 fun List<IosVersion>.getDescription(versionId: String) = findVersion(versionId)?.prepareDescription().orErrorMessage(versionId)
 

diff --git a/test_runner/src/main/kotlin/ftl/filter/TestFilters.kt b/test_runner/src/main/kotlin/ftl/filter/TestFilters.kt
@@ -2,8 +2,8 @@ package ftl.filter
 
 import com.linkedin.dex.parser.TestMethod
 import ftl.config.FtlConstants
-import ftl.util.FlankConfigurationError
-import ftl.util.FlankGeneralError
+import ftl.run.exception.FlankConfigurationError
+import ftl.run.exception.FlankGeneralError
 import java.io.IOException
 import java.nio.file.Files
 import java.nio.file.Paths

diff --git a/test_runner/src/main/kotlin/ftl/gc/GcAndroidTestMatrix.kt b/test_runner/src/main/kotlin/ftl/gc/GcAndroidTestMatrix.kt
@@ -18,7 +18,7 @@ import ftl.gc.android.mapToDeviceFiles
 import ftl.gc.android.setEnvironmentVariables
 import ftl.gc.android.setupAndroidTest
 import ftl.run.platform.android.AndroidTestConfig
-import ftl.util.FlankGeneralError
+import ftl.run.exception.FlankGeneralError
 import ftl.util.join
 import ftl.util.timeoutToSeconds
 

diff --git a/test_runner/src/main/kotlin/ftl/gc/GcIosTestMatrix.kt b/test_runner/src/main/kotlin/ftl/gc/GcIosTestMatrix.kt
@@ -16,7 +16,7 @@ import com.google.api.services.testing.model.ToolResultsHistory
 import ftl.args.IosArgs
 import ftl.ios.Xctestrun
 import ftl.ios.Xctestrun.toByteArray
-import ftl.util.FlankGeneralError
+import ftl.run.exception.FlankGeneralError
 import ftl.util.ShardCounter
 import ftl.util.join
 import ftl.util.timeoutToSeconds

diff --git a/test_runner/src/main/kotlin/ftl/gc/GcStorage.kt b/test_runner/src/main/kotlin/ftl/gc/GcStorage.kt
@@ -13,7 +13,7 @@ import ftl.config.FtlConstants.GCS_PREFIX
 import ftl.reports.xml.model.JUnitTestResult
 import ftl.reports.xml.parseAllSuitesXml
 import ftl.reports.xml.xmlToString
-import ftl.util.FlankGeneralError
+import ftl.run.exception.FlankGeneralError
 import ftl.util.ProgressBar
 import ftl.util.join
 import java.io.File

diff --git a/test_runner/src/main/kotlin/ftl/gc/GcTestMatrix.kt b/test_runner/src/main/kotlin/ftl/gc/GcTestMatrix.kt
@@ -3,7 +3,7 @@ package ftl.gc
 import com.google.api.services.testing.model.CancelTestMatrixResponse
 import com.google.api.services.testing.model.TestMatrix
 import ftl.http.executeWithRetry
-import ftl.util.FlankGeneralError
+import ftl.run.exception.FlankGeneralError
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.withContext

diff --git a/test_runner/src/main/kotlin/ftl/gc/GcToolResults.kt b/test_runner/src/main/kotlin/ftl/gc/GcToolResults.kt
@@ -19,10 +19,10 @@ import ftl.config.FtlConstants.applicationName
 import ftl.config.FtlConstants.httpCredential
 import ftl.config.FtlConstants.httpTransport
 import ftl.http.executeWithRetry
-import ftl.util.FTLProjectError
-import ftl.util.FlankGeneralError
-import ftl.util.PermissionDenied
-import ftl.util.ProjectNotFound
+import ftl.run.exception.FTLProjectError
+import ftl.run.exception.FlankGeneralError
+import ftl.run.exception.PermissionDenied
+import ftl.run.exception.ProjectNotFound
 
 object GcToolResults {
 

diff --git a/test_runner/src/main/kotlin/ftl/http/ExecuteWithRetry.kt b/test_runner/src/main/kotlin/ftl/http/ExecuteWithRetry.kt
@@ -3,8 +3,8 @@ package ftl.http
 import com.google.api.client.googleapis.services.json.AbstractGoogleJsonClientRequest
 import com.google.api.client.http.HttpResponseException
 import ftl.config.FtlConstants
-import ftl.util.PermissionDenied
-import ftl.util.ProjectNotFound
+import ftl.run.exception.PermissionDenied
+import ftl.run.exception.ProjectNotFound
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.runBlocking
 import java.io.IOException

diff --git a/test_runner/src/main/kotlin/ftl/ios/Parse.kt b/test_runner/src/main/kotlin/ftl/ios/Parse.kt
@@ -1,8 +1,8 @@
 package ftl.ios
 
 import ftl.config.FtlConstants.isMacOS
+import ftl.run.exception.FlankGeneralError
 import ftl.util.Bash
-import ftl.util.FlankGeneralError
 import ftl.util.copyBinaryResource
 import java.io.File
 

diff --git a/test_runner/src/main/kotlin/ftl/ios/Xctestrun.kt b/test_runner/src/main/kotlin/ftl/ios/Xctestrun.kt
@@ -4,7 +4,7 @@ import com.dd.plist.NSArray
 import com.dd.plist.NSDictionary
 import com.dd.plist.NSString
 import com.dd.plist.PropertyListParser
-import ftl.util.FlankGeneralError
+import ftl.run.exception.FlankGeneralError
 import java.io.ByteArrayOutputStream
 import java.io.File
 import java.nio.file.Paths

diff --git a/test_runner/src/main/kotlin/ftl/json/MatrixMap.kt b/test_runner/src/main/kotlin/ftl/json/MatrixMap.kt
@@ -1,11 +1,11 @@
 package ftl.json
 
 import com.google.api.services.testing.model.TestMatrix
-import ftl.util.FTLError
-import ftl.util.FailedMatrixError
-import ftl.util.IncompatibleTestDimensionError
-import ftl.util.InfrastructureError
-import ftl.util.MatrixCanceledError
+import ftl.run.exception.FTLError
+import ftl.run.exception.FailedMatrixError
+import ftl.run.exception.IncompatibleTestDimensionError
+import ftl.run.exception.InfrastructureError
+import ftl.run.exception.MatrixCanceledError
 import ftl.util.MatrixState
 
 class MatrixMap(

diff --git a/test_runner/src/main/kotlin/ftl/mock/MockServer.kt b/test_runner/src/main/kotlin/ftl/mock/MockServer.kt
@@ -35,7 +35,7 @@ import ftl.config.FtlConstants
 import ftl.config.FtlConstants.JSON_FACTORY
 import ftl.log.LogbackLogger
 import ftl.util.Bash
-import ftl.util.FlankGeneralError
+import ftl.run.exception.FlankGeneralError
 import ftl.util.StepOutcome.failure
 import ftl.util.StepOutcome.flaky
 import ftl.util.StepOutcome.inconclusive

diff --git a/test_runner/src/main/kotlin/ftl/mock/TestArtifact.kt b/test_runner/src/main/kotlin/ftl/mock/TestArtifact.kt
@@ -1,6 +1,6 @@
 package ftl.mock
 
-import ftl.util.FlankGeneralError
+import ftl.run.exception.FlankGeneralError
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.ResponseBody
@@ -14,6 +14,7 @@ import java.net.Socket
 import java.nio.file.Files
 import java.nio.file.Paths
 import java.util.concurrent.TimeUnit
+import kotlin.math.pow
 import java.util.zip.ZipFile
 import kotlin.math.pow
 

diff --git a/test_runner/src/main/kotlin/ftl/reports/outcome/TestOutcomeContext.kt b/test_runner/src/main/kotlin/ftl/reports/outcome/TestOutcomeContext.kt
@@ -7,7 +7,7 @@ import com.google.api.services.toolresults.model.Step
 import ftl.gc.GcToolResults
 import ftl.json.SavedMatrix
 import ftl.json.createSavedMatrix
-import ftl.util.FTLError
+import ftl.run.exception.FTLError
 import ftl.util.timeoutToSeconds
 
 data class TestOutcomeContext(

diff --git a/test_runner/src/main/kotlin/ftl/reports/xml/JUnitXml.kt b/test_runner/src/main/kotlin/ftl/reports/xml/JUnitXml.kt
@@ -7,7 +7,7 @@ import com.fasterxml.jackson.module.kotlin.KotlinModule
 import ftl.reports.xml.model.JUnitTestResult
 import ftl.reports.xml.model.JUnitTestSuite
 import ftl.reports.xml.preprocesor.fixHtmlCodes
-import ftl.util.FlankGeneralError
+import ftl.run.exception.FlankGeneralError
 import java.io.File
 import java.nio.file.Files
 import java.nio.file.Path

diff --git a/test_runner/src/main/kotlin/ftl/reports/xml/model/JUnitTestSuite.kt b/test_runner/src/main/kotlin/ftl/reports/xml/model/JUnitTestSuite.kt
@@ -2,7 +2,7 @@ package ftl.reports.xml.model
 
 import com.fasterxml.jackson.annotation.JsonInclude
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty
-import ftl.util.FlankGeneralError
+import ftl.run.exception.FlankGeneralError
 import java.util.Locale
 
 data class JUnitTestSuite(

diff --git a/test_runner/src/main/kotlin/ftl/run/DumpShards.kt b/test_runner/src/main/kotlin/ftl/run/DumpShards.kt
@@ -4,9 +4,9 @@ import ftl.args.AndroidArgs
 import ftl.args.IosArgs
 import ftl.args.isInstrumentationTest
 import ftl.run.common.prettyPrint
+import ftl.run.exception.FlankConfigurationError
 import ftl.run.model.AndroidMatrixTestShards
 import ftl.run.platform.android.getAndroidMatrixShards
-import ftl.util.FlankConfigurationError
 import ftl.util.obfuscatePrettyPrinter
 import java.nio.file.Files
 import java.nio.file.Paths