fix: increase timeout to avoid flakiness [skip ci]

Author: paullatzelsperger

.github/workflows/verify.yaml

@@ -74,7 +74,7 @@ jobs:
         uses: ./.github/actions/run-tests
         with:
           command: |
-            ./gradlew test -DincludeTags="AzureStorageIntegrationTest"
+            ./gradlew test -DincludeTags="AzureStorageIntegrationTest" --refresh-dependencies
 
 
 

system-tests/tests/src/testFixtures/java/org/eclipse/edc/test/system/utils/Constants.java

@@ -0,0 +1,22 @@
+/*
+ *  Copyright (c) 2023 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+ *
+ *  This program and the accompanying materials are made available under the
+ *  terms of the Apache License, Version 2.0 which is available at
+ *  https://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  SPDX-License-Identifier: Apache-2.0
+ *
+ *  Contributors:
+ *       Bayerische Motoren Werke Aktiengesellschaft (BMW AG) - initial API and implementation
+ *
+ */
+
+package org.eclipse.edc.test.system.utils;
+
+import java.time.Duration;
+
+public interface Constants {
+    Duration POLL_INTERVAL = Duration.ofSeconds(2);
+    Duration TIMEOUT = Duration.ofMinutes(1);
+}

system-tests/tests/src/testFixtures/java/org/eclipse/edc/test/system/utils/TransferTestClient.java

@@ -45,6 +45,8 @@
 import static org.eclipse.edc.spi.CoreConstants.EDC_NAMESPACE;
 import static org.eclipse.edc.spi.CoreConstants.EDC_PREFIX;
 import static org.eclipse.edc.test.system.local.TransferRuntimeConfiguration.CONSUMER_PARTICIPANT_ID;
+import static org.eclipse.edc.test.system.utils.Constants.POLL_INTERVAL;
+import static org.eclipse.edc.test.system.utils.Constants.TIMEOUT;
 import static org.hamcrest.Matchers.is;
 
 /**
@@ -74,7 +76,7 @@ public JsonArray getCatalogDatasets(String providerUrl) {
                 .add("protocol", "dataspace-protocol-http")
                 .build();
 
-        await().untilAsserted(() -> {
+        await().atMost(TIMEOUT).pollInterval(POLL_INTERVAL).untilAsserted(() -> {
             var response = givenConsumerRequest()
                     .contentType(JSON)
                     .when()
@@ -132,7 +134,7 @@ public String negotiateContract(String providerId, String providerUrl, String of
                 .statusCode(200)
                 .extract().body().jsonPath().getString(ID);
 
-        await().untilAsserted(() -> {
+        await().atMost(TIMEOUT).pollInterval(POLL_INTERVAL).untilAsserted(() -> {
             var state = getContractNegotiationState(negotiationId);
             assertThat(state).isEqualTo(FINALIZED.name());
         });
@@ -143,7 +145,7 @@ public String negotiateContract(String providerId, String providerUrl, String of
     public String getContractAgreementId(String negotiationId) {
         var contractAgreementId = new AtomicReference<String>();
 
-        await().untilAsserted(() -> {
+        await().atMost(TIMEOUT).pollInterval(POLL_INTERVAL).untilAsserted(() -> {
             var agreementId = getContractNegotiationField(negotiationId, "contractAgreementId");
             assertThat(agreementId).isNotNull().isInstanceOf(String.class);
 

system-tests/tests/src/testFixtures/java/org/eclipse/edc/test/system/utils/TransferTestRunner.java

@@ -14,12 +14,16 @@
 
 package org.eclipse.edc.test.system.utils;
 
+import org.eclipse.edc.connector.transfer.spi.types.TransferProcessStates;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 import static org.eclipse.edc.connector.transfer.spi.types.TransferProcessStates.STARTED;
 import static org.eclipse.edc.jsonld.spi.PropertyAndTypeNames.ODRL_POLICY_ATTRIBUTE;
 import static org.eclipse.edc.test.system.local.TransferRuntimeConfiguration.PROVIDER_ASSET_ID;
 import static org.eclipse.edc.test.system.local.TransferRuntimeConfiguration.PROVIDER_PARTICIPANT_ID;
+import static org.eclipse.edc.test.system.utils.Constants.POLL_INTERVAL;
+import static org.eclipse.edc.test.system.utils.Constants.TIMEOUT;
 import static org.eclipse.edc.test.system.utils.TransferTestClient.getContractId;
 
 /**
@@ -46,10 +50,13 @@ public void executeTransfer() {
         var destination = configuration.createBlobDestination();
         var transferProcessId = client.initiateTransfer(contractAgreementId, PROVIDER_ASSET_ID, configuration.getProviderIdsUrl(), destination);
 
-        await().untilAsserted(() -> {
-            var state = client.getTransferProcessState(transferProcessId);
-            assertThat(state).isEqualTo(STARTED.name());
-        });
+        await().pollInterval(POLL_INTERVAL)
+                .atMost(TIMEOUT)
+                .untilAsserted(() -> {
+                    var state = client.getTransferProcessState(transferProcessId);
+                    // should be STARTED or some state after that to make it more robust.
+                    assertThat(TransferProcessStates.valueOf(state).code()).isGreaterThanOrEqualTo(STARTED.code());
+                });
 
         var transferProcess = client.getTransferProcess(transferProcessId);
         assertThat(configuration.isTransferResultValid(transferProcess)).isTrue();