Skip to content

Commit 7953da1

Browse files
fruchfruch
committed
update older version patch to test specific one with smp=1
* clusters_should_not_leak_connections * connectionLeakTest * PoolingOptionsIntegrationTest
1 parent 262960c commit 7953da1

File tree

3 files changed

+174
-6
lines changed

3 files changed

+174
-6
lines changed

‎versions/scylla/3.10.2.1/patch‎

Lines changed: 57 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
diff --git c/driver-core/src/test/java/com/datastax/driver/core/CCMBridge.java w/driver-core/src/test/java/com/datastax/driver/core/CCMBridge.java
1+
diff --git a/driver-core/src/test/java/com/datastax/driver/core/CCMBridge.java b/driver-core/src/test/java/com/datastax/driver/core/CCMBridge.java
22
index f890b3447..042dfdbad 100644
3-
--- c/driver-core/src/test/java/com/datastax/driver/core/CCMBridge.java
4-
+++ w/driver-core/src/test/java/com/datastax/driver/core/CCMBridge.java
3+
--- a/driver-core/src/test/java/com/datastax/driver/core/CCMBridge.java
4+
+++ b/driver-core/src/test/java/com/datastax/driver/core/CCMBridge.java
55
@@ -172,13 +172,17 @@ public class CCMBridge implements CCMAccess {
66
String installDirectory = System.getProperty("cassandra.directory");
77
String branch = System.getProperty("cassandra.branch");
@@ -49,10 +49,61 @@ index f890b3447..042dfdbad 100644
4949
}
5050

5151
/**
52-
diff --git c/pom.xml w/pom.xml
52+
diff --git a/driver-core/src/test/java/com/datastax/driver/core/ClusterStressTest.java b/driver-core/src/test/java/com/datastax/driver/core/ClusterStressTest.java
53+
index e7a62993b..a315cf347 100644
54+
--- a/driver-core/src/test/java/com/datastax/driver/core/ClusterStressTest.java
55+
+++ b/driver-core/src/test/java/com/datastax/driver/core/ClusterStressTest.java
56+
@@ -35,6 +35,7 @@ import org.slf4j.LoggerFactory;
57+
import org.testng.annotations.AfterMethod;
58+
import org.testng.annotations.Test;
59+
60+
+@CCMConfig(jvmArgs = {"--smp", "1"})
61+
public class ClusterStressTest extends CCMTestsSupport {
62+
63+
private static final Logger logger = LoggerFactory.getLogger(ClusterStressTest.class);
64+
diff --git a/driver-core/src/test/java/com/datastax/driver/core/PoolingOptionsIntegrationTest.java b/driver-core/src/test/java/com/datastax/driver/core/PoolingOptionsIntegrationTest.java
65+
index 7dc809d81..f480e6868 100644
66+
--- a/driver-core/src/test/java/com/datastax/driver/core/PoolingOptionsIntegrationTest.java
67+
+++ b/driver-core/src/test/java/com/datastax/driver/core/PoolingOptionsIntegrationTest.java
68+
@@ -28,7 +28,9 @@ import java.util.concurrent.TimeUnit;
69+
import org.testng.annotations.AfterMethod;
70+
import org.testng.annotations.Test;
71+
72+
-@CCMConfig(createSession = false)
73+
+@CCMConfig(
74+
+ createSession = false,
75+
+ jvmArgs = {"--smp", "1"})
76+
public class PoolingOptionsIntegrationTest extends CCMTestsSupport {
77+
78+
private ThreadPoolExecutor executor;
79+
diff --git a/driver-core/src/test/java/com/datastax/driver/core/SessionLeakTest.java b/driver-core/src/test/java/com/datastax/driver/core/SessionLeakTest.java
80+
index cc6940575..c6e15b562 100644
81+
--- a/driver-core/src/test/java/com/datastax/driver/core/SessionLeakTest.java
82+
+++ b/driver-core/src/test/java/com/datastax/driver/core/SessionLeakTest.java
83+
@@ -20,6 +20,7 @@ import static com.datastax.driver.core.CreateCCM.TestMode.PER_METHOD;
84+
import static com.datastax.driver.core.TestUtils.nonDebouncingQueryOptions;
85+
import static com.google.common.collect.Lists.newArrayList;
86+
import static java.util.concurrent.TimeUnit.MINUTES;
87+
+import static org.assertj.core.api.Assertions.assertThat;
88+
import static org.assertj.core.api.Assertions.fail;
89+
90+
import com.datastax.driver.core.exceptions.InvalidQueryException;
91+
@@ -28,7 +29,10 @@ import java.util.concurrent.TimeUnit;
92+
import org.testng.annotations.Test;
93+
94+
@CreateCCM(PER_METHOD)
95+
-@CCMConfig(dirtiesContext = true, createCluster = false)
96+
+@CCMConfig(
97+
+ dirtiesContext = true,
98+
+ createCluster = false,
99+
+ jvmArgs = {"--smp", "1"})
100+
public class SessionLeakTest extends CCMTestsSupport {
101+
102+
SocketChannelMonitor channelMonitor;
103+
diff --git a/pom.xml b/pom.xml
53104
index 944e40986..deec3fa47 100644
54-
--- c/pom.xml
55-
+++ w/pom.xml
105+
--- a/pom.xml
106+
+++ b/pom.xml
56107
@@ -75,7 +75,7 @@
57108
<!-- more recent versions of pax-exam require JDK7+ -->
58109
<pax-exam.version>3.6.0</pax-exam.version>

‎versions/scylla/3.11.0.1/patch‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,3 +181,57 @@ index 8d4f10b55..e6df9ec1c 100644
181181
public class NettyOptionsTest extends CCMTestsSupport {
182182

183183
@Test(groups = "short")
184+
diff --git a/driver-core/src/test/java/com/datastax/driver/core/PoolingOptionsIntegrationTest.java b/driver-core/src/test/java/com/datastax/driver/core/PoolingOptionsIntegrationTest.java
185+
index 7dc809d81..f480e6868 100644
186+
--- a/driver-core/src/test/java/com/datastax/driver/core/PoolingOptionsIntegrationTest.java
187+
+++ b/driver-core/src/test/java/com/datastax/driver/core/PoolingOptionsIntegrationTest.java
188+
@@ -28,7 +28,9 @@ import java.util.concurrent.TimeUnit;
189+
import org.testng.annotations.AfterMethod;
190+
import org.testng.annotations.Test;
191+
192+
-@CCMConfig(createSession = false)
193+
+@CCMConfig(
194+
+ createSession = false,
195+
+ jvmArgs = {"--smp", "1"})
196+
public class PoolingOptionsIntegrationTest extends CCMTestsSupport {
197+
198+
private ThreadPoolExecutor executor;
199+
diff --git a/driver-core/src/test/java/com/datastax/driver/core/SessionLeakTest.java b/driver-core/src/test/java/com/datastax/driver/core/SessionLeakTest.java
200+
index aa0f57379..6eaa74e31 100644
201+
--- a/driver-core/src/test/java/com/datastax/driver/core/SessionLeakTest.java
202+
+++ b/driver-core/src/test/java/com/datastax/driver/core/SessionLeakTest.java
203+
@@ -19,6 +19,7 @@ import static com.datastax.driver.core.Assertions.assertThat;
204+
import static com.datastax.driver.core.CreateCCM.TestMode.PER_METHOD;
205+
import static com.google.common.collect.Lists.newArrayList;
206+
import static java.util.concurrent.TimeUnit.MINUTES;
207+
+import static org.assertj.core.api.Assertions.assertThat;
208+
import static org.assertj.core.api.Assertions.fail;
209+
210+
import com.datastax.driver.core.exceptions.InvalidQueryException;
211+
@@ -27,7 +28,10 @@ import java.util.concurrent.TimeUnit;
212+
import org.testng.annotations.Test;
213+
214+
@CreateCCM(PER_METHOD)
215+
-@CCMConfig(dirtiesContext = true, createCluster = false)
216+
+@CCMConfig(
217+
+ dirtiesContext = true,
218+
+ createCluster = false,
219+
+ jvmArgs = {"--smp", "1"})
220+
public class SessionLeakTest extends CCMTestsSupport {
221+
222+
SocketChannelMonitor channelMonitor;
223+
diff --git a/driver-core/src/test/java/com/datastax/driver/core/SessionStressTest.java b/driver-core/src/test/java/com/datastax/driver/core/SessionStressTest.java
224+
index 25fde7d5d..d7f664c33 100644
225+
--- a/driver-core/src/test/java/com/datastax/driver/core/SessionStressTest.java
226+
+++ b/driver-core/src/test/java/com/datastax/driver/core/SessionStressTest.java
227+
@@ -38,7 +38,9 @@ import org.slf4j.LoggerFactory;
228+
import org.testng.annotations.AfterMethod;
229+
import org.testng.annotations.Test;
230+
231+
-@CCMConfig(dirtiesContext = true)
232+
+@CCMConfig(
233+
+ dirtiesContext = true,
234+
+ jvmArgs = {"--smp", "1"})
235+
public class SessionStressTest extends CCMTestsSupport {
236+
237+
private static final Logger logger = LoggerFactory.getLogger(SessionStressTest.class);

‎versions/scylla/3.11.2.4/patch‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,3 +189,66 @@ index 5c7fc1fc4..cd47f02be 100644
189189
public class NettyOptionsTest extends CCMTestsSupport {
190190

191191
@Test(groups = "short")
192+
diff --git a/driver-core/src/test/java/com/datastax/driver/core/ReconnectionTest.java b/driver-core/src/test/java/com/datastax/driver/core/ReconnectionTest.java
193+
index 96ccc4412..80f64109a 100644
194+
--- a/driver-core/src/test/java/com/datastax/driver/core/ReconnectionTest.java
195+
+++ b/driver-core/src/test/java/com/datastax/driver/core/ReconnectionTest.java
196+
@@ -24,6 +24,7 @@ package com.datastax.driver.core;
197+
import static com.datastax.driver.core.Assertions.assertThat;
198+
import static com.datastax.driver.core.CreateCCM.TestMode.PER_METHOD;
199+
import static java.util.concurrent.TimeUnit.SECONDS;
200+
+import static org.assertj.core.api.Assertions.assertThat;
201+
import static org.mockito.Mockito.reset;
202+
import static org.mockito.Mockito.spy;
203+
import static org.mockito.Mockito.times;
204+
@@ -218,7 +219,10 @@ public class ReconnectionTest extends CCMTestsSupport {
205+
* The connection established by a successful reconnection attempt should be reused in one of the
206+
* connection pools (JAVA-505).
207+
*/
208+
- @CCMConfig(dirtiesContext = true, createCluster = false)
209+
+ @CCMConfig(
210+
+ dirtiesContext = true,
211+
+ createCluster = false,
212+
+ jvmArgs = {"--smp", "1"})
213+
@Test(groups = "long")
214+
public void should_use_connection_from_reconnection_in_pool() {
215+
TogglabePolicy loadBalancingPolicy = new TogglabePolicy(new RoundRobinPolicy());
216+
diff --git a/driver-core/src/test/java/com/datastax/driver/core/SessionLeakTest.java b/driver-core/src/test/java/com/datastax/driver/core/SessionLeakTest.java
217+
index aa0f57379..6eaa74e31 100644
218+
--- a/driver-core/src/test/java/com/datastax/driver/core/SessionLeakTest.java
219+
+++ b/driver-core/src/test/java/com/datastax/driver/core/SessionLeakTest.java
220+
@@ -19,6 +19,7 @@ import static com.datastax.driver.core.Assertions.assertThat;
221+
import static com.datastax.driver.core.CreateCCM.TestMode.PER_METHOD;
222+
import static com.google.common.collect.Lists.newArrayList;
223+
import static java.util.concurrent.TimeUnit.MINUTES;
224+
+import static org.assertj.core.api.Assertions.assertThat;
225+
import static org.assertj.core.api.Assertions.fail;
226+
227+
import com.datastax.driver.core.exceptions.InvalidQueryException;
228+
@@ -27,7 +28,10 @@ import java.util.concurrent.TimeUnit;
229+
import org.testng.annotations.Test;
230+
231+
@CreateCCM(PER_METHOD)
232+
-@CCMConfig(dirtiesContext = true, createCluster = false)
233+
+@CCMConfig(
234+
+ dirtiesContext = true,
235+
+ createCluster = false,
236+
+ jvmArgs = {"--smp", "1"})
237+
public class SessionLeakTest extends CCMTestsSupport {
238+
239+
SocketChannelMonitor channelMonitor;
240+
diff --git a/driver-core/src/test/java/com/datastax/driver/core/SessionStressTest.java b/driver-core/src/test/java/com/datastax/driver/core/SessionStressTest.java
241+
index 25fde7d5d..d7f664c33 100644
242+
--- a/driver-core/src/test/java/com/datastax/driver/core/SessionStressTest.java
243+
+++ b/driver-core/src/test/java/com/datastax/driver/core/SessionStressTest.java
244+
@@ -38,7 +38,9 @@ import org.slf4j.LoggerFactory;
245+
import org.testng.annotations.AfterMethod;
246+
import org.testng.annotations.Test;
247+
248+
-@CCMConfig(dirtiesContext = true)
249+
+@CCMConfig(
250+
+ dirtiesContext = true,
251+
+ jvmArgs = {"--smp", "1"})
252+
public class SessionStressTest extends CCMTestsSupport {
253+
254+
private static final Logger logger = LoggerFactory.getLogger(SessionStressTest.class);

0 commit comments

Comments
 (0)