Fix test retries for shade and backwards compat tests (apache#10207)

- some relevant code was missing from PR apache#10191
sarvex · Apr 16, 2021 · 5752363 · 5752363
1 parent 3021bad
commit 5752363
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 0 deletions.
diff --git a/tests/bc_2_0_0/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java b/tests/bc_2_0_0/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java
@@ -41,6 +41,7 @@ public class SmokeTest extends TestRetrySupport {
     @Override
     @BeforeClass(alwaysRun = true)
     public final void setup(){
+        incrementSetupNumber();
         pulsarContainer = new PulsarContainer();
         pulsarContainer.start();
     }
@@ -77,6 +78,7 @@ public void checkMessages() throws PulsarClientException {
     @Override
     @AfterClass(alwaysRun = true)
     public final void cleanup(){
+        markCurrentSetupNumberCleaned();
         pulsarContainer.stop();
     }
 

diff --git a/tests/bc_2_0_1/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java b/tests/bc_2_0_1/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java
@@ -41,6 +41,7 @@ public class SmokeTest extends TestRetrySupport {
     @Override
     @BeforeClass(alwaysRun = true)
     public final void setup(){
+        incrementSetupNumber();
         pulsarContainer = new PulsarContainer();
         pulsarContainer.start();
     }
@@ -77,6 +78,7 @@ public void checkMessages() throws PulsarClientException {
     @Override
     @AfterClass(alwaysRun = true)
     public final void cleanup(){
+        markCurrentSetupNumberCleaned();
         pulsarContainer.stop();
     }
 

diff --git a/tests/bc_2_6_0/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java b/tests/bc_2_6_0/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java
@@ -41,6 +41,7 @@ public class SmokeTest extends TestRetrySupport {
     @Override
     @BeforeClass(alwaysRun = true)
     public final void setup(){
+        incrementSetupNumber();
         pulsarContainer = new PulsarContainer();
         pulsarContainer.start();
     }
@@ -77,6 +78,7 @@ public void checkMessages() throws PulsarClientException {
     @Override
     @AfterClass(alwaysRun = true)
     public final void cleanup(){
+        markCurrentSetupNumberCleaned();
         pulsarContainer.stop();
     }
 

diff --git a/...de-test/src/test/java/org/apache/pulsar/tests/integration/SimpleProducerConsumerTest.java b/...de-test/src/test/java/org/apache/pulsar/tests/integration/SimpleProducerConsumerTest.java
@@ -69,6 +69,7 @@ public class SimpleProducerConsumerTest extends TestRetrySupport {
     @Override
     @BeforeClass(alwaysRun = true)
     public void setup() throws Exception {
+        incrementSetupNumber();
         Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider());
 
         pulsarContainer = new PulsarContainer();
@@ -89,6 +90,7 @@ public void setup() throws Exception {
     @Override
     @AfterClass(alwaysRun = true)
     public void cleanup() throws Exception {
+        markCurrentSetupNumberCleaned();
         if (pulsarClient != null) {
             pulsarClient.close();
             pulsarClient = null;

diff --git a/...-client-admin-shade-test/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java b/...-client-admin-shade-test/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java
@@ -45,6 +45,7 @@ public class SmokeTest extends TestRetrySupport {
     @Override
     @BeforeClass(alwaysRun = true)
     public final void setup() {
+        incrementSetupNumber();
         pulsarContainer = new PulsarContainer();
         pulsarContainer.start();
     }
@@ -90,6 +91,7 @@ public void checkAdmin() throws PulsarClientException, PulsarAdminException {
     @Override
     @AfterClass(alwaysRun = true)
     public final void cleanup(){
+        markCurrentSetupNumberCleaned();
         pulsarContainer.stop();
     }
 

diff --git a/...de-test/src/test/java/org/apache/pulsar/tests/integration/SimpleProducerConsumerTest.java b/...de-test/src/test/java/org/apache/pulsar/tests/integration/SimpleProducerConsumerTest.java
@@ -65,6 +65,7 @@ public class SimpleProducerConsumerTest extends TestRetrySupport {
     @Override
     @BeforeClass(alwaysRun = true)
     public void setup() throws Exception {
+        incrementSetupNumber();
         Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider());
         pulsarContainer = new PulsarContainer();
         pulsarContainer.start();
@@ -84,6 +85,7 @@ public void setup() throws Exception {
     @Override
     @AfterClass(alwaysRun = true)
     public void cleanup() throws Exception {
+        markCurrentSetupNumberCleaned();
         if (pulsarClient != null) {
             pulsarClient.close();
             pulsarClient = null;

diff --git a/...ar-client-all-shade-test/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java b/...ar-client-all-shade-test/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java
@@ -45,6 +45,7 @@ public class SmokeTest extends TestRetrySupport {
     @Override
     @BeforeClass(alwaysRun = true)
     public final void setup(){
+        incrementSetupNumber();
         pulsarContainer = new PulsarContainer();
         pulsarContainer.start();
     }
@@ -90,6 +91,7 @@ public void checkAdmin() throws PulsarClientException, PulsarAdminException {
     @Override
     @AfterClass(alwaysRun = true)
     public final void cleanup(){
+        markCurrentSetupNumberCleaned();
         pulsarContainer.stop();
     }
 

diff --git a/...de-test/src/test/java/org/apache/pulsar/tests/integration/SimpleProducerConsumerTest.java b/...de-test/src/test/java/org/apache/pulsar/tests/integration/SimpleProducerConsumerTest.java
@@ -69,6 +69,7 @@ public class SimpleProducerConsumerTest extends TestRetrySupport {
     @Override
     @BeforeClass(alwaysRun = true)
     public void setup() throws Exception {
+        incrementSetupNumber();
         Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider());
         pulsarContainer = new PulsarContainer();
         pulsarContainer.start();
@@ -88,6 +89,7 @@ public void setup() throws Exception {
     @Override
     @AfterClass(alwaysRun = true)
     public void cleanup() throws Exception {
+        markCurrentSetupNumberCleaned();
         if (pulsarClient != null) {
             pulsarClient.close();
             pulsarClient = null;

diff --git a/...pulsar-client-shade-test/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java b/...pulsar-client-shade-test/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java
@@ -41,6 +41,7 @@ public class SmokeTest extends TestRetrySupport {
     @Override
     @BeforeClass(alwaysRun = true)
     public final void setup(){
+        incrementSetupNumber();
         pulsarContainer = new PulsarContainer();
         pulsarContainer.start();
     }
@@ -77,6 +78,7 @@ public void checkClient() throws PulsarClientException {
     @Override
     @AfterClass(alwaysRun = true)
     public final void cleanup(){
+        markCurrentSetupNumberCleaned();
         pulsarContainer.stop();
     }