Skip to content

Fix test retries for shade and backwards compat tests #10207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merlimat merged 1 commit into from
Apr 16, 2021
Merged

Fix test retries for shade and backwards compat tests #10207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions tests/bc_2_0_0/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ public class SmokeTest extends TestRetrySupport {
@Override
@BeforeClass(alwaysRun = true)
public final void setup(){
incrementSetupNumber();
pulsarContainer = new PulsarContainer();
pulsarContainer.start();
}
Expand Down Expand Up @@ -77,6 +78,7 @@ public void checkMessages() throws PulsarClientException {
@Override
@AfterClass(alwaysRun = true)
public final void cleanup(){
markCurrentSetupNumberCleaned();
pulsarContainer.stop();
}

Expand Down
2 changes: 2 additions & 0 deletions tests/bc_2_0_1/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ public class SmokeTest extends TestRetrySupport {
@Override
@BeforeClass(alwaysRun = true)
public final void setup(){
incrementSetupNumber();
pulsarContainer = new PulsarContainer();
pulsarContainer.start();
}
Expand Down Expand Up @@ -77,6 +78,7 @@ public void checkMessages() throws PulsarClientException {
@Override
@AfterClass(alwaysRun = true)
public final void cleanup(){
markCurrentSetupNumberCleaned();
pulsarContainer.stop();
}

Expand Down
2 changes: 2 additions & 0 deletions tests/bc_2_6_0/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ public class SmokeTest extends TestRetrySupport {
@Override
@BeforeClass(alwaysRun = true)
public final void setup(){
incrementSetupNumber();
pulsarContainer = new PulsarContainer();
pulsarContainer.start();
}
Expand Down Expand Up @@ -77,6 +78,7 @@ public void checkMessages() throws PulsarClientException {
@Override
@AfterClass(alwaysRun = true)
public final void cleanup(){
markCurrentSetupNumberCleaned();
pulsarContainer.stop();
}

Expand Down
2 changes: 2 additions & 0 deletions ...de-test/src/test/java/org/apache/pulsar/tests/integration/SimpleProducerConsumerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions ...-client-admin-shade-test/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ public class SmokeTest extends TestRetrySupport {
@Override
@BeforeClass(alwaysRun = true)
public final void setup() {
incrementSetupNumber();
pulsarContainer = new PulsarContainer();
pulsarContainer.start();
}
Expand Down Expand Up @@ -90,6 +91,7 @@ public void checkAdmin() throws PulsarClientException, PulsarAdminException {
@Override
@AfterClass(alwaysRun = true)
public final void cleanup(){
markCurrentSetupNumberCleaned();
pulsarContainer.stop();
}

Expand Down
2 changes: 2 additions & 0 deletions ...de-test/src/test/java/org/apache/pulsar/tests/integration/SimpleProducerConsumerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions ...ar-client-all-shade-test/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ public class SmokeTest extends TestRetrySupport {
@Override
@BeforeClass(alwaysRun = true)
public final void setup(){
incrementSetupNumber();
pulsarContainer = new PulsarContainer();
pulsarContainer.start();
}
Expand Down Expand Up @@ -90,6 +91,7 @@ public void checkAdmin() throws PulsarClientException, PulsarAdminException {
@Override
@AfterClass(alwaysRun = true)
public final void cleanup(){
markCurrentSetupNumberCleaned();
pulsarContainer.stop();
}

Expand Down
2 changes: 2 additions & 0 deletions ...de-test/src/test/java/org/apache/pulsar/tests/integration/SimpleProducerConsumerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions ...pulsar-client-shade-test/src/test/java/org/apache/pulsar/tests/integration/SmokeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ public class SmokeTest extends TestRetrySupport {
@Override
@BeforeClass(alwaysRun = true)
public final void setup(){
incrementSetupNumber();
pulsarContainer = new PulsarContainer();
pulsarContainer.start();
}
Expand Down Expand Up @@ -77,6 +78,7 @@ public void checkClient() throws PulsarClientException {
@Override
@AfterClass(alwaysRun = true)
public final void cleanup(){
markCurrentSetupNumberCleaned();
pulsarContainer.stop();
}

Expand Down