From cb2d41f61f518607271edaf2c86395704390bdbd Mon Sep 17 00:00:00 2001 From: Danny Faught Date: Fri, 29 Sep 2023 17:11:27 -0700 Subject: [PATCH] refactor: rename variable * The meaning of the name "retryFailOnPassedAfterRetry" was difficult to understand. It causes the full test run to fail when a flaky test is detected (both passes and fails on multiple runs). * Seems the indirection is required, first setting and checking a variable, then setting the "failOnPassedAfterRetry" property used by the retry plugin. --- build.gradle | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index ddca6f561b2..6468f50dd3c 100644 --- a/build.gradle +++ b/build.gradle @@ -91,12 +91,13 @@ subprojects { jvmArgs += ["-Xmx1024m", "-XX:+StartAttachListener", "-XX:+HeapDumpOnOutOfMemoryError", "-XX:HeapDumpPath=/var/log/uaa-tests.hprof"] retry { - def retryFailOnPassedAfterRetry = Boolean.parseBoolean( + def failOnPassedAfterRetrySystemProperty = Boolean.parseBoolean( System.getProperty("failOnPassedAfterRetry", "false")); - if (!retryFailOnPassedAfterRetry) + if (!failOnPassedAfterRetrySystemProperty) logger.warn("retry: Flaky tests will not make the test run fail because failOnPassedAfterRetry is false.") - failOnPassedAfterRetry = retryFailOnPassedAfterRetry + // Configure the retry extension + failOnPassedAfterRetry = failOnPassedAfterRetrySystemProperty maxFailures = Integer.parseInt(System.getProperty("maxFailures", "3")) maxRetries = Integer.parseInt(System.getProperty("maxRetries", "1")) }