Skip to content

Commit cd69eb2

Browse files
committed
Revert "added more checking"
This reverts commit c01f396.
1 parent c01f396 commit cd69eb2

File tree

4 files changed

+7
-24
lines changed

4 files changed

+7
-24
lines changed

java/client/build.gradle

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ configurations {
1919
}
2020

2121
dependencies {
22-
implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '4.29.3'
22+
implementation group: 'com.google.protobuf', name: 'protobuf-java', version: '4.29.1'
2323
shadow group: 'org.apache.commons', name: 'commons-lang3', version: '3.13.0'
2424

2525
shadow group: 'io.netty', name: 'netty-handler', version: '4.1.115.Final'
@@ -28,7 +28,6 @@ dependencies {
2828
shadow group: 'io.netty', name: 'netty-transport-native-epoll', version: '4.1.115.Final', classifier: 'linux-x86_64'
2929
shadow group: 'io.netty', name: 'netty-transport-native-epoll', version: '4.1.115.Final', classifier: 'linux-aarch_64'
3030
shadow group: 'io.netty', name: 'netty-transport-native-kqueue', version: '4.1.115.Final', classifier: 'osx-aarch_64'
31-
shadow group: 'io.netty', name: 'netty-transport-native-kqueue', version: '4.1.115.Final', classifier: 'osx-x86_64'
3231

3332
// junit
3433
testImplementation group: 'org.mockito', name: 'mockito-inline', version: '3.12.4'

java/integTest/src/test/java/glide/SharedClientTests.java

+3-8
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import net.bytebuddy.utility.RandomString;
2929
import org.junit.jupiter.api.AfterAll;
3030
import org.junit.jupiter.api.BeforeAll;
31-
import org.junit.jupiter.api.RepeatedTest;
3231
import org.junit.jupiter.api.Timeout;
3332
import org.junit.jupiter.params.ParameterizedTest;
3433
import org.junit.jupiter.params.provider.Arguments;
@@ -139,14 +138,10 @@ private static Stream<Arguments> inflightRequestsLimitSizeAndClusterMode() {
139138
Arguments.of(true, 1000));
140139
}
141140

142-
@RepeatedTest(1000)
143141
@SneakyThrows
144-
// @ParameterizedTest()
145-
// @MethodSource("inflightRequestsLimitSizeAndClusterMode")
146-
public void inflight_requests_limit() {
147-
boolean clusterMode = false;
148-
int inflightRequestsLimit = 1000;
149-
142+
@ParameterizedTest()
143+
@MethodSource("inflightRequestsLimitSizeAndClusterMode")
144+
public void inflight_requests_limit(boolean clusterMode, int inflightRequestsLimit) {
150145
BaseClient testClient;
151146
String keyName = "nonexistkeylist" + RandomString.make(4);
152147

java/integTest/src/test/java/glide/cluster/CommandTests.java

+3-5
Original file line numberDiff line numberDiff line change
@@ -1723,11 +1723,9 @@ public void fcall_binary_with_keys(GlideClusterClient clusterClient, String pref
17231723
}
17241724

17251725
@SneakyThrows
1726-
// @ParameterizedTest
1727-
// @MethodSource("getClients")
1728-
public void fcall_readonly_function() {
1729-
GlideClusterClient clusterClient =
1730-
GlideClusterClient.createClient(commonClusterClientConfig().build()).get();
1726+
@ParameterizedTest
1727+
@MethodSource("getClients")
1728+
public void fcall_readonly_function(GlideClusterClient clusterClient) {
17311729
assumeTrue(SERVER_VERSION.isGreaterThanOrEqualTo("7.0.0"), "This feature added in version 7");
17321730

17331731
String libName = "fcall_readonly_function_" + UUID.randomUUID().toString().replace("-", "_");

java/integTest/src/test/java/glide/standalone/CommandTests.java

-9
Original file line numberDiff line numberDiff line change
@@ -1867,15 +1867,6 @@ public void scriptKill_unkillable(GlideClient regularClient) {
18671867
foundUnkillable = true;
18681868
break;
18691869
}
1870-
1871-
if (execException.getCause() instanceof RequestException
1872-
&& execException
1873-
.getMessage()
1874-
.toLowerCase()
1875-
.contains("no scripts in execution right now")) {
1876-
promise = testClient.invokeScript(script, ScriptOptions.builder().key(key).build());
1877-
Thread.sleep(1000);
1878-
}
18791870
}
18801871
Thread.sleep(500);
18811872
timeout -= 500;

0 commit comments

Comments
 (0)