From a836c0a594d446ac7fbca225089ca9cd1dabcf83 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Thu, 15 Apr 2021 21:30:24 +0300 Subject: [PATCH] Fix test retries for shade and backwards compat tests - some relevant code was missing from PR #10191 --- .../java/org/apache/pulsar/tests/integration/SmokeTest.java | 2 ++ .../java/org/apache/pulsar/tests/integration/SmokeTest.java | 2 ++ .../java/org/apache/pulsar/tests/integration/SmokeTest.java | 2 ++ .../pulsar/tests/integration/SimpleProducerConsumerTest.java | 2 ++ .../java/org/apache/pulsar/tests/integration/SmokeTest.java | 2 ++ .../pulsar/tests/integration/SimpleProducerConsumerTest.java | 2 ++ .../java/org/apache/pulsar/tests/integration/SmokeTest.java | 2 ++ .../pulsar/tests/integration/SimpleProducerConsumerTest.java | 2 ++ .../java/org/apache/pulsar/tests/integration/SmokeTest.java | 2 ++ 9 files changed, 18 insertions(+) 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 index b9d0798f9776b..b2510709c0def 100644 --- 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 index b9d0798f9776b..b2510709c0def 100644 --- 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 index b9d0798f9776b..b2510709c0def 100644 --- 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/tests/pulsar-client-admin-shade-test/src/test/java/org/apache/pulsar/tests/integration/SimpleProducerConsumerTest.java b/tests/pulsar-client-admin-shade-test/src/test/java/org/apache/pulsar/tests/integration/SimpleProducerConsumerTest.java index d00463e810e3e..994f4f12c3bf2 100644 --- a/tests/pulsar-client-admin-shade-test/src/test/java/org/apache/pulsar/tests/integration/SimpleProducerConsumerTest.java +++ b/tests/pulsar-client-admin-shade-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/tests/pulsar-client-admin-shade-test/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java b/tests/pulsar-client-admin-shade-test/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java index d7c43f376286a..23b893074fdc8 100644 --- a/tests/pulsar-client-admin-shade-test/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java +++ b/tests/pulsar-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/tests/pulsar-client-all-shade-test/src/test/java/org/apache/pulsar/tests/integration/SimpleProducerConsumerTest.java b/tests/pulsar-client-all-shade-test/src/test/java/org/apache/pulsar/tests/integration/SimpleProducerConsumerTest.java index b4b04cd8abec0..ae17eb50450be 100644 --- a/tests/pulsar-client-all-shade-test/src/test/java/org/apache/pulsar/tests/integration/SimpleProducerConsumerTest.java +++ b/tests/pulsar-client-all-shade-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/tests/pulsar-client-all-shade-test/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java b/tests/pulsar-client-all-shade-test/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java index 478b60b3ba7fa..1271d708794e2 100644 --- a/tests/pulsar-client-all-shade-test/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java +++ b/tests/pulsar-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/tests/pulsar-client-shade-test/src/test/java/org/apache/pulsar/tests/integration/SimpleProducerConsumerTest.java b/tests/pulsar-client-shade-test/src/test/java/org/apache/pulsar/tests/integration/SimpleProducerConsumerTest.java index 035453e1db877..c58ec85c4a31f 100644 --- a/tests/pulsar-client-shade-test/src/test/java/org/apache/pulsar/tests/integration/SimpleProducerConsumerTest.java +++ b/tests/pulsar-client-shade-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/tests/pulsar-client-shade-test/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java b/tests/pulsar-client-shade-test/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java index c8eb9cdd09a2c..1fc0cf6fd771f 100644 --- a/tests/pulsar-client-shade-test/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java +++ b/tests/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(); }