SKYEDEN-3020 | resolve conflicts

allegro · Jan 10, 2025 · 4e2865e · 4e2865e
1 parent f87be3a
commit 4e2865e
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/...tionTest/java/pl/allegro/tech/hermes/integrationtests/KafkaRetransmissionServiceTest.java b/...tionTest/java/pl/allegro/tech/hermes/integrationtests/KafkaRetransmissionServiceTest.java
@@ -90,19 +90,20 @@ public void shouldMoveOffsetNearGivenTimestamp(boolean suspendedSubscription)
             .retransmit(
                 topic.getQualifiedName(), subscription.getName(), retransmissionDate, false);
 
-    if (suspendedSubscription) {
-      hermes.api().activateSubscription(topic, subscription.getName());
-      hermes.api().waitUntilSubscriptionActivated(topic.getQualifiedName(), subscription.getName());
-    }
-
     // then
-    response.expectStatus().isOk();
     // Check if Kafka committed offsets were moved on retransmission
     assertThat(
             hermes
                 .api()
                 .calculateCommittedMessages(topic.getQualifiedName(), subscription.getName()))
         .isLessThan(commitedMessages);
+    response.expectStatus().isOk();
+
+    if (suspendedSubscription) {
+      hermes.api().activateSubscription(topic, subscription.getName());
+      hermes.api().waitUntilSubscriptionActivated(topic.getQualifiedName(), subscription.getName());
+    }
+
     messages2.forEach(subscriber::waitUntilReceived);
     hermes.api().waitUntilConsumerCommitsOffset(topic.getQualifiedName(), subscription.getName());
     assertThat(