Make integration tests compatible with RE by uglide · Pull Request #4387 · redis/jedis

uglide · 2026-01-02T17:45:41Z

Guard all RE-incompatible integration tests with @ConditionalOnEnv
Fixes all time-based issues when running tests against RE

github-actions · 2026-01-02T17:58:49Z

Test Results

301 files 301 suites 11m 53s ⏱️
10 908 tests 10 852 ✅ 56 💤 0 ❌
5 631 runs 5 622 ✅ 9 💤 0 ❌

Results for commit 0bca405.

♻️ This comment has been updated with latest results.

uglide · 2026-01-27T14:57:08Z

augment review

augmentcode · 2026-01-27T15:01:18Z

🤖 Augment PR Summary

Summary: This PR updates Jedis integration tests to run cleanly against Redis Enterprise (RE) environments.

Changes:

Introduces widespread use of @ConditionalOnEnv to skip tests/variants that are incompatible with RE.
Adds/propagates the EnvCondition JUnit 5 extension in several base test classes so env-gated tests are evaluated consistently.
Skips or adjusts RE-incompatible command tests (e.g., blocking list ops, BITOP, SORT STORE, COPY/RENAME-related cases) across commandobjects/jedis/unified/pipeline suites.
Relaxes a few timing-sensitive assertions (e.g., HPTTL tolerance, OBJECT IDLETIME) to reduce flakiness.
Updates control/config tests to use slowlog-max-len instead of maxmemory for broader compatibility.
Improves stability in a few tests via small lifecycle/ordering tweaks (e.g., slowlog entry selection, cluster teardown guarding).

Technical Notes: The new environment gating relies on TestEnvUtil.TEST_ENV_PROVIDER and the EnvCondition execution condition to enable/disable tests at runtime.

_{🤖 Was this summary useful? React with 👍 or 👎}

augmentcode

Review completed. 3 suggestions posted.

Comment augment review to trigger a new review at any time.

augmentcode · 2026-01-27T15:01:19Z

 public class SentinelCommandsTest {

+  @RegisterExtension
+  public  EnvCondition envCondition = new EnvCondition();


Because @ConditionalOnEnv is used at class level and prepare() does endpoint lookups, consider registering EnvCondition as a static @RegisterExtension (or via @ExtendWith) so the condition can disable the container before @BeforeAll runs in Redis Enterprise.

_{🤖 Was this useful? React with 👍 or 👎}

augmentcode · 2026-01-27T15:01:19Z

    assertEquals(0, client.clientList(ClientType.MASTER).length());
    assertEquals(1, client.clientList(ClientType.SLAVE).split("\\n").length);
-    assertEquals(1, client.clientList(ClientType.REPLICA).split("\\n").length);
+    if (!TestEnvUtil.getTestEnvProvider().equals(TestEnvUtil.ENV_REDIS_ENTERPRISE)) {


EnvCondition matches environments via equalsIgnoreCase, but this inline check uses equals, so TEST_ENV_PROVIDER=RE/Re would not be treated as Redis Enterprise here. Consider using a case-insensitive comparison for consistency with the rest of the environment gating.

_{🤖 Was this useful? React with 👍 or 👎}

equalsIgnoreCase make sense

augmentcode · 2026-01-27T15:01:20Z

  @AfterAll
  public static void resetRedisAfter() {
-    removeSlots();
+    if (endpoint != null) {


With the @BeforeAll slot reset removed, a previously “dirty” cluster-unbound could keep slot assignments between runs and impact early assertions. Consider doing a one-time removeSlots() after endpoint is initialized in prepareEndpoints(), in addition to the @AfterAll cleanup.

_{🤖 Was this useful? React with 👍 or 👎}

- Use endpoint in useWithoutConnecting - Disable startWithUri() on RE

…rge data transfer

…e' into im/skip-it-not-compatible-with-re

- Rely on correctly configured Redis Cluster instead of testing outdated workarounds with hostname mapping - Merge ACL, SSLOptions and RedisClusterClientIT into one test - Remove redundant utilities

jit-ci · 2026-02-24T15:02:59Z

🛡️ Jit Security Scan Results

✅ No security findings were detected in this PR

^{Security scan by Jit}

ggivo

LGTM,

Added a note related to the timeseries test increase of timeouts. I think it is not needed

ggivo · 2026-02-25T09:44:21Z

    assertEquals(-1856719580, v.hashCode());
  }

  @Test


Suggested change

@Test

public void testAddStar() throws InterruptedException {

Map<String, String> labels = new HashMap<>();

labels.put("l11", "v11");

labels.put("l22", "v22");

assertEquals("OK", client.tsCreate("seriesAdd2", TSCreateParams.createParams().retention(10000L).labels(labels)));

// Use 50ms for cases when Redis is not running locally

int delayInMillis = 2;

long startTime = serverTime(jedis);

long add1 = client.tsAdd("seriesAdd2", 1.1);

assertTrue(add1 >= startTime);

Thread.sleep(delayInMillis);

long add2 = client.tsAdd("seriesAdd2", 3.2);

assertTrue(add2 > startTime);

Thread.sleep(delayInMillis);

long add3 = client.tsAdd("seriesAdd2", 3.2);

assertTrue(add3 > add2);

Thread.sleep(delayInMillis);

long add4 = client.tsAdd("seriesAdd2", -1.2);

assertTrue(add4 > add3);

Thread.sleep(delayInMillis);

long endTime = serverTime(jedis);

assertTrue(endTime > add4);

List<TSElement> values = client.tsRange("seriesAdd2", startTime, add3);

assertEquals(3, values.size());

}

/**

* Server time in milliseconds since the Epoch.

* @param redis

* @return

*/

long serverTime(Jedis redis) {

List<String> serverTime = redis.time();

return Instant.ofEpochSecond(Long.parseLong(serverTime.get(0)))

.plusMillis(Long.parseLong(serverTime.get(1)) / 1_000).toEpochMilli();

}

First, we need to add missing time command to the UnifiedJedis :) Let's keep this change for later

uglide force-pushed the im/skip-it-not-compatible-with-re branch 2 times, most recently from ee72417 to c266e87 Compare January 5, 2026 16:19

uglide force-pushed the im/skip-it-not-compatible-with-re branch 2 times, most recently from 2b77f6b to 74d5ebf Compare January 23, 2026 14:24

augmentcode Bot reviewed Jan 27, 2026

View reviewed changes

uglide force-pushed the im/skip-it-not-compatible-with-re branch 2 times, most recently from 5334382 to 659c4d4 Compare February 16, 2026 13:30

uglide added 17 commits February 20, 2026 17:55

Make command tests compatible with RE

3aa6309

Skip more incompatible tests

f25e345

Allow up to 1 sec for HFE assertions

3ea96b8

Use standalone-0 endpoint in ConnectionTest instead of hardcoded 6379

66662ec

Fix ACLJedisTest

78bf293

- Use endpoint in useWithoutConnecting - Disable startWithUri() on RE

Add 5 minutes timeout for Junit tests

de372a2

Skip incompatible tests in TransactionV2Test

22e07c3

Skip handleClientOutputBufferLimitForSubscribeTooSlow on RE due to la…

c0624cd

…rge data transfer

EnvCondition should be static

777901d

Add guards for more incompatible tests

a2c2d91

Skip more tests

f8bec63

Fix TimeSeriesTest

08d924c

Fix UnavailableConnectionTest

151f49a

Fix ConsolidatedConfigurationCommandsTest

1d88f7f

Align property name for tls certificates path

c6d2b87

Check if the path is absolute in TlsUtil

9ec7617

Disable CSC tests with heavy write on RE env

4ae3bd0

uglide force-pushed the im/skip-it-not-compatible-with-re branch from 1e67bce to 4ae3bd0 Compare February 20, 2026 16:55

uglide and others added 2 commits February 23, 2026 12:12

Merge branch 'master' into im/skip-it-not-compatible-with-re

18f6087

Add missing guard for RE

1ae3334

uglide and others added 4 commits February 23, 2026 14:33

Merge remote-tracking branch 'origin/im/skip-it-not-compatible-with-r…

9ca6e65

…e' into im/skip-it-not-compatible-with-re

Refactor Cluster TLS tests to focus on production scenarios

36bfec7

- Rely on correctly configured Redis Cluster instead of testing outdated workarounds with hostname mapping - Merge ACL, SSLOptions and RedisClusterClientIT into one test - Remove redundant utilities

Remove assertions on cluster topology in the TLS test

bec81f8

Merge branch 'master' into im/skip-it-not-compatible-with-re

00523d4

uglide marked this pull request as ready for review February 24, 2026 15:32

uglide requested a review from ggivo February 24, 2026 15:32

ggivo approved these changes Feb 25, 2026

View reviewed changes

Merge branch 'master' into im/skip-it-not-compatible-with-re

0bca405

uglide merged commit f669f98 into master Feb 26, 2026
13 of 14 checks passed

uglide deleted the im/skip-it-not-compatible-with-re branch February 26, 2026 10:30

ggivo added the maintenance label Mar 11, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make integration tests compatible with RE#4387

Make integration tests compatible with RE#4387
uglide merged 24 commits intomasterfrom
im/skip-it-not-compatible-with-re

uglide commented Jan 2, 2026 •

edited

Loading

Uh oh!

github-actions Bot commented Jan 2, 2026 •

edited

Loading

Uh oh!

uglide commented Jan 27, 2026

Uh oh!

augmentcode Bot commented Jan 27, 2026

Uh oh!

augmentcode Bot left a comment

Uh oh!

augmentcode Bot Jan 27, 2026

Uh oh!

augmentcode Bot Jan 27, 2026

Uh oh!

ggivo Feb 25, 2026

Uh oh!

augmentcode Bot Jan 27, 2026

Uh oh!

jit-ci Bot commented Feb 24, 2026 •

edited

Loading

Uh oh!

ggivo left a comment

Uh oh!

ggivo Feb 25, 2026

Uh oh!

uglide Feb 26, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

+@Test
+  public void testAddStar() throws InterruptedException {
+    Map<String, String> labels = new HashMap<>();
+    labels.put("l11", "v11");
+    labels.put("l22", "v22");
+    assertEquals("OK", client.tsCreate("seriesAdd2", TSCreateParams.createParams().retention(10000L).labels(labels)));
+    // Use 50ms for cases when Redis is not running locally
+    int delayInMillis = 2;
+    long startTime = serverTime(jedis);
+    long add1 = client.tsAdd("seriesAdd2", 1.1);
+    assertTrue(add1 >= startTime);
+    Thread.sleep(delayInMillis);
+    long add2 = client.tsAdd("seriesAdd2", 3.2);
+    assertTrue(add2 > startTime);
+    Thread.sleep(delayInMillis);
+    long add3 = client.tsAdd("seriesAdd2", 3.2);
+    assertTrue(add3 > add2);
+    Thread.sleep(delayInMillis);
+    long add4 = client.tsAdd("seriesAdd2", -1.2);
+    assertTrue(add4 > add3);
+    Thread.sleep(delayInMillis);
+    long endTime = serverTime(jedis);
+    assertTrue(endTime > add4);
+    List<TSElement> values = client.tsRange("seriesAdd2", startTime, add3);
+    assertEquals(3, values.size());
+  }
+  /**
+   * Server time in milliseconds since the Epoch.
+   * @param redis
+   * @return
+   */
+  long serverTime(Jedis redis) {
+    List<String> serverTime = redis.time();
+    return Instant.ofEpochSecond(Long.parseLong(serverTime.get(0)))
+            .plusMillis(Long.parseLong(serverTime.get(1)) / 1_000).toEpochMilli();
+  }

Conversation

uglide commented Jan 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Jan 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Test Results

Uh oh!

uglide commented Jan 27, 2026

Uh oh!

augmentcode Bot commented Jan 27, 2026

Uh oh!

augmentcode Bot left a comment

Choose a reason for hiding this comment

Uh oh!

augmentcode Bot Jan 27, 2026

Choose a reason for hiding this comment

Uh oh!

augmentcode Bot Jan 27, 2026

Choose a reason for hiding this comment

Uh oh!

ggivo Feb 25, 2026

Choose a reason for hiding this comment

Uh oh!

augmentcode Bot Jan 27, 2026

Choose a reason for hiding this comment

Uh oh!

jit-ci Bot commented Feb 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🛡️ Jit Security Scan Results

Uh oh!

ggivo left a comment

Choose a reason for hiding this comment

Uh oh!

ggivo Feb 25, 2026

Choose a reason for hiding this comment

Uh oh!

uglide Feb 26, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

uglide commented Jan 2, 2026 •

edited

Loading

github-actions Bot commented Jan 2, 2026 •

edited

Loading

jit-ci Bot commented Feb 24, 2026 •

edited

Loading