Skip to content

FollowUp: Retry annotation should work on class level #4091

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
qianheng-aws merged 2 commits into from
Aug 22, 2025
Merged

FollowUp: Retry annotation should work on class level #4091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ddc250c
FollowUp: Retry annotation should work on class level
LantaoJin Aug 21, 2025
eee70da
Ignore testQ7 in macOS
LantaoJin Aug 21, 2025
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
4 changes: 4 additions & 0 deletions integ-test/src/test/java/org/opensearch/sql/calcite/tpch/CalcitePPLTpchIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
import static org.opensearch.sql.util.MatcherUtils.verifySchemaInOrder;

import java.io.IOException;
import java.util.Locale;
import org.json.JSONObject;
import org.junit.Assume;
import org.junit.Ignore;
import org.junit.Test;
import org.opensearch.sql.ppl.PPLIntegTestCase;
Expand Down Expand Up @@ -176,6 +178,8 @@ public void testQ6() throws IOException {

@Test
public void testQ7() throws IOException {
String osName = System.getProperty("os.name").toLowerCase(Locale.ROOT);
Assume.assumeFalse("testQ7 on macOS CI could socket timeout", osName.contains("mac"));
String ppl = sanitize(loadFromFile("tpch/queries/q7.ppl"));
JSONObject actual = executeQuery(ppl);
verifySchemaInOrder(
Expand Down
5 changes: 4 additions & 1 deletion integ-test/src/test/java/org/opensearch/sql/util/RetryProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

package org.opensearch.sql.util;

import java.util.Optional;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.junit.rules.TestWatcher;
Expand All @@ -17,7 +18,9 @@ public class RetryProcessor extends TestWatcher {

@Override
public Statement apply(Statement base, Description description) {
Retry retry = description.getAnnotation(Retry.class);
Retry retry =
Optional.ofNullable(description.getAnnotation(Retry.class))
.orElseGet(() -> description.getTestClass().getAnnotation(Retry.class));
if (retry == null) {
return base;
}
Expand Down
Loading