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

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

Merge "Temporarily disable Conscrypt perf tests" into main am: af78422c 

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



Change-Id: I843f6bd5c9be3a7f0986e82bc8f690404153cea0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7ebddb1c af78422c

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

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ public final class ClientSocketPerfTest { 
    /**

     * Simple benchmark for the amount of time to send a given number of messages

     */

    @Test

    // @Test Temporarily disabled

    @Parameters(method = "getParams")

    public void time(Config config) throws Exception {

        reset();

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

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ public final class ServerSocketPerfTest { 
        executor.awaitTermination(5, TimeUnit.SECONDS);

    }



    @Test

    // @Test Temporarily disabled

    @Parameters(method = "getParams")

    public void throughput(Config config) throws Exception {

        setup(config);