diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-05-12 11:12:39 +0200 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-05-12 11:12:39 +0200 |
| commit | 3c0d512c691dc2506ff90c5b68c0af3c4ca6a712 (patch) | |
| tree | e50ec52a5397e181eedc4c5361d48f8ae13a28cd | |
| parent | 9425ab38b40cf64be76adf67a5341d65aefa14bc (diff) | |
| parent | d0b5ba34bba5543de05663320030b2d48d1bc307 (diff) | |
| download | mullvadvpn-3c0d512c691dc2506ff90c5b68c0af3c4ca6a712.tar.xz mullvadvpn-3c0d512c691dc2506ff90c5b68c0af3c4ca6a712.zip | |
Merge branch 'increase-e2e-requests-timeout'
| -rw-r--r-- | android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/router/packetCapture/PacketCapture.kt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/router/packetCapture/PacketCapture.kt b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/router/packetCapture/PacketCapture.kt index 5122227d3a..e192eacc4a 100644 --- a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/router/packetCapture/PacketCapture.kt +++ b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/router/packetCapture/PacketCapture.kt @@ -61,6 +61,7 @@ class PacketCapture { private fun defaultHttpClient(): HttpClient = HttpClient(CIO) { defaultRequest { url("http://${BuildConfig.TEST_ROUTER_API_HOST}") } + engine { requestTimeout = REQUEST_TIMEOUT_MS } install(ContentNegotiation) { json( @@ -123,3 +124,6 @@ class PacketCaptureClient(private val httpClient: HttpClient = defaultHttpClient data class PacketCaptureResult(val streams: List<Stream>, val pcap: ByteArray) @Serializable data class StartCaptureRequestJson(val label: PacketCaptureSession) + +// 30 seconds timeout, double the default timeout +private const val REQUEST_TIMEOUT_MS = 30000L |