| commit | 07c952fff6e6ca78746815965cc6adf321dab954 | [log] [tgz] |
|---|---|---|
| author | Miguel Aranda <miguelaranda@google.com> | Tue Oct 29 14:11:59 2024 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Oct 29 14:11:59 2024 +0000 |
| tree | d1db223626c86e1aed1930d82f4f6dc51d4eb49b | |
| parent | d5908ace20ae7f736e4d6a872302618f7635d63e [diff] |
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
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 3577fcd..f20b170 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 @@ /** * 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 ac57100..af3c405 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 @@ executor.awaitTermination(5, TimeUnit.SECONDS); } - // @Test Temporarily disabled + @Test @Parameters(method = "getParams") public void throughput(Config config) throws Exception { setup(config);