This is an automated email from the ASF dual-hosted git repository.
blerer pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit c8ca54a67e3bbf91d0ee1d4d522f85e17c788075
Merge: 55a651a b07a626
Author: Benjamin Lerer <b.le...@gmail.com>
AuthorDate: Wed Feb 17 14:12:41 2021 +0100
Merge branch cassandra-3.11 into trunk
.../apache/cassandra/distributed/test/CASTest.java | 45 ++++++++++++++--------
1 file changed, 29 insertions(+), 16 deletions(-)
diff --cc test/distributed/org/apache/cassandra/distributed/test/CASTest.java
index 4cefbf0,2da661d..91d26f8
--- a/test/distributed/org/apache/cassandra/distributed/test/CASTest.java
+++ b/test/distributed/org/apache/cassandra/distributed/test/CASTest.java
@@@ -56,8 -52,16 +56,18 @@@ import static org.junit.Assert.assertTr
public class CASTest extends TestBaseImpl
{
+ private static final Logger logger =
LoggerFactory.getLogger(CASTest.class);
+
+ /**
+ * The {@code cas_contention_timeout_in_ms} used during the tests
+ */
+ private static final long CONTENTION_TIMEOUT = 1000L;
+
+ /**
+ * The {@code write_request_timeout_in_ms} used during the tests
+ */
+ private static final long REQUEST_TIMEOUT = 1000L;
+
@Test
public void simpleUpdate() throws Throwable
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
