From 07c952fff6e6ca78746815965cc6adf321dab954 Mon Sep 17 00:00:00 2001 From: Miguel Aranda Date: Tue, 29 Oct 2024 14:11:59 +0000 Subject: Revert "Temporarily disable Conscrypt perf tests" This reverts commit d5908ace20ae7f736e4d6a872302618f7635d63e. Reason for revert: Should be fixed by https://googleplex-android-review.git.corp.google.com/30115196 Change-Id: I57bd781cbcfaeb61b4c8d7731782baada2519967 --- .../core/src/android/conscrypt/conscrypt/ClientSocketPerfTest.java | 2 +- .../core/src/android/conscrypt/conscrypt/ServerSocketPerfTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apct-tests/perftests/core/src/android/conscrypt/conscrypt/ClientSocketPerfTest.java b/apct-tests/perftests/core/src/android/conscrypt/conscrypt/ClientSocketPerfTest.java index 3577fcdf04d6..f20b1706129b 100644 --- a/apct-tests/perftests/core/src/android/conscrypt/conscrypt/ClientSocketPerfTest.java +++ b/apct-tests/perftests/core/src/android/conscrypt/conscrypt/ClientSocketPerfTest.java @@ -194,7 +194,7 @@ public final class ClientSocketPerfTest { /** * Simple benchmark for the amount of time to send a given number of messages */ - // @Test Temporarily disabled + @Test @Parameters(method = "getParams") public void time(Config config) throws Exception { reset(); diff --git a/apct-tests/perftests/core/src/android/conscrypt/conscrypt/ServerSocketPerfTest.java b/apct-tests/perftests/core/src/android/conscrypt/conscrypt/ServerSocketPerfTest.java index ac5710047db9..af3c405eab82 100644 --- a/apct-tests/perftests/core/src/android/conscrypt/conscrypt/ServerSocketPerfTest.java +++ b/apct-tests/perftests/core/src/android/conscrypt/conscrypt/ServerSocketPerfTest.java @@ -198,7 +198,7 @@ public final class ServerSocketPerfTest { executor.awaitTermination(5, TimeUnit.SECONDS); } - // @Test Temporarily disabled + @Test @Parameters(method = "getParams") public void throughput(Config config) throws Exception { setup(config); -- cgit v1.2.3-59-g8ed1b