Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a460081 authored by Miguel Aranda's avatar Miguel Aranda Committed by Automerger Merge Worker
Browse files

Merge "Ignore failing conscrypt perf tests until I figure out why they're... 

Merge "Ignore failing conscrypt perf tests until I figure out why they're failing." into main am: 4dd6ff97

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3200931



Change-Id: Ia1c78856a6c0debba08666f7d6c57f13f135df4e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents aef46ec2 4dd6ff97

apct-tests/perftests/core/src/android/conscrypt/conscrypt/ClientSocketPerfTest.java

+2 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import java.util.concurrent.atomic.AtomicLong; 
import javax.crypto.Cipher;

import javax.crypto.NoSuchPaddingException;



import org.junit.Ignore;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -196,6 +197,7 @@ public final class ClientSocketPerfTest { 
     */

    @Test

    @Parameters(method = "getParams")

    @Ignore("b/351034205")

    public void time(Config config) throws Exception {

        reset();

        setup(config);

apct-tests/perftests/core/src/android/conscrypt/conscrypt/ServerSocketPerfTest.java

+2 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import androidx.test.filters.LargeTest; 
import junitparams.JUnitParamsRunner;

import junitparams.Parameters;



import org.junit.Ignore;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -201,6 +202,7 @@ public final class ServerSocketPerfTest { 


    @Test

    @Parameters(method = "getParams")

    @Ignore("b/351034205")

    public void throughput(Config config) throws Exception {

        setup(config);

        BenchmarkState state = mPerfStatusReporter.getBenchmarkState();