joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "[Cronet] skip presubmit for flaky tests" into main

Browse source
This commit is contained in:
Treehugger Robot 2023-07-26 10:29:40 +00:00 • committed by Gerrit Code Review
commit b868a462fd
3 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Cronet/tests/cts/src/android/net/http/cts/BidirectionalStreamTest.kt
View file

@ -27,6 +27,7 @@ import android.os.Build
import androidx.test.core.app.ApplicationProvider
import com.android.testutils.DevSdkIgnoreRule
import com.android.testutils.DevSdkIgnoreRunner
import com.android.testutils.SkipPresubmit
import com.google.common.truth.Truth.assertThat
import kotlin.test.Test
import kotlin.test.assertEquals
@ -35,7 +36,6 @@ import org.hamcrest.Matchers
import org.junit.After
import org.junit.AssumptionViolatedException
import org.junit.Before
import org.junit.Ignore
import org.junit.runner.RunWith
private const val URL = "https://source.android.com"
@ -69,7 +69,7 @@ class BidirectionalStreamTest {
@Test
@Throws(Exception::class)
@Ignore("b/292298108 Re-enable and confirm non-flaky after SLO")
@SkipPresubmit(reason = "b/293141085 Confirm non-flaky and move to presubmit after SLO")
fun testBidirectionalStream_GetStream_CompletesSuccessfully() {
stream = createBidirectionalStreamBuilder(URL).setHttpMethod("GET").build()
stream!!.start()

5
Cronet/tests/mts/jarjar_excludes.txt
View file

@ -1,5 +1,8 @@
# It's prohibited to jarjar androidx packages
# jarjar-gen can't handle some kotlin object expression, exclude packages that include them
androidx\..+
kotlin\.test\..+
kotlin\.reflect\..+
org\.mockito\..+
# Do not jarjar the api classes
android\.net\..+
# cronet_tests.so is not jarjared and uses base classes. We can remove this when there's a

6
TEST_MAPPING
View file

@ -99,6 +99,9 @@
{
"name": "NetHttpCoverageTests",
"options": [
{
"exclude-annotation": "com.android.testutils.SkipPresubmit"
},
{
// These sometimes take longer than 1 min which is the presubmit timeout
"exclude-annotation": "androidx.test.filters.LargeTest"
@ -225,6 +228,9 @@
{
"name": "NetHttpCoverageTests[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]",
"options": [
{
"exclude-annotation": "com.android.testutils.SkipPresubmit"
},
{
// These sometimes take longer than 1 min which is the presubmit timeout
"exclude-annotation": "androidx.test.filters.LargeTest"