From 06bb5cda27bfd656e2e15819c1b742dd08b3b3e6 Mon Sep 17 00:00:00 2001
From: pkazlenka <pkazlenka@mirantis.com>
Date: Tue, 6 Feb 2024 13:00:51 +0100
Subject: [PATCH] 5575: [TEST]: Fix retry mechanism in tests

Implements #5575

* add description
---
 src-java/testing/functional-tests/build.gradle            | 2 +-
 .../spec/server42/Server42FlowRttSpec.groovy              | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src-java/testing/functional-tests/build.gradle b/src-java/testing/functional-tests/build.gradle
index bbb19573721..fd549b5ea9a 100644
--- a/src-java/testing/functional-tests/build.gradle
+++ b/src-java/testing/functional-tests/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'groovy'
     id 'com.adarshr.test-logger' version '3.1.0'
-    id 'org.gradle.test-retry' version '1.3.1'
+    id 'org.gradle.test-retry' version '1.5.8'
 }
 description = 'Functional-Tests'
 
diff --git a/src-java/testing/functional-tests/src/test/groovy/org/openkilda/functionaltests/spec/server42/Server42FlowRttSpec.groovy b/src-java/testing/functional-tests/src/test/groovy/org/openkilda/functionaltests/spec/server42/Server42FlowRttSpec.groovy
index f4e04b3afa6..e90794423f8 100644
--- a/src-java/testing/functional-tests/src/test/groovy/org/openkilda/functionaltests/spec/server42/Server42FlowRttSpec.groovy
+++ b/src-java/testing/functional-tests/src/test/groovy/org/openkilda/functionaltests/spec/server42/Server42FlowRttSpec.groovy
@@ -92,7 +92,7 @@ class Server42FlowRttSpec extends HealthCheckSpecification {
 
         then: "Check if stats for forward are available"
         Wrappers.wait(STATS_FROM_SERVER42_LOGGING_TIMEOUT, 1) {
-            flowStats.of(flow.getFlowId()).get(FLOW_RTT, FORWARD, SERVER_42).hasNonZeroValues()
+            assert flowStats.of(flow.getFlowId()).get(FLOW_RTT, FORWARD, SERVER_42).hasNonZeroValues()
         }
 
         cleanup: "Revert system to original state"
@@ -559,16 +559,16 @@ class Server42FlowRttSpec extends HealthCheckSpecification {
         data << [
                  [
                          flowDescription: "vxlan",
-                         switchPair     : {switchPairs.all()
+                         switchPair     : switchPairs.all()
                                  .withBothSwitchesConnectedToServer42()
                                  .withBothSwitchesVxLanEnabled()
                                  .withSourceSwitchNotManufacturedBy(WB5164)
-                                 .random()} ,
+                                 .random(),
                          flowTap        : { FlowRequestV2 fl -> fl.encapsulationType = VXLAN }
                  ],
                  [
                          flowDescription: "qinq",
-                         switchPair     : {switchPairs.all().withBothSwitchesConnectedToServer42().random()},
+                         switchPair     : switchPairs.all().withBothSwitchesConnectedToServer42().random(),
                          flowTap        : { FlowRequestV2 fl ->
                              fl.source.vlanId = 10
                              fl.source.innerVlanId = 100