cqlshlib tests: increase default execute timeout

Patch by Stefania Alborghetti; reviewed by Philip Thompson for CASSANDRA-12481


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/40c2d45c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/40c2d45c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/40c2d45c

Branch: refs/heads/cassandra-3.9
Commit: 40c2d45c5ed3828c8f5e3aebec673b81d231d465
Parents: 77924b3
Author: Stefania Alborghetti <stefania.alborghe...@datastax.com>
Authored: Wed Aug 31 15:13:45 2016 +0800
Committer: Stefania Alborghetti <stefania.alborghe...@datastax.com>
Committed: Thu Sep 1 10:18:35 2016 +0800

----------------------------------------------------------------------
 CHANGES.txt                        | 1 +
 pylib/cqlshlib/test/cassconnect.py | 2 ++
 2 files changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/40c2d45c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d7e9394..a6a1114 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.8
+ * cqlshlib tests: increase default execute timeout (CASSANDRA-12481)
  * Forward writes to replacement node when replace_address != 
broadcast_address (CASSANDRA-8523)
  * Enable repair -pr and -local together (fix regression of CASSANDRA-7450) 
(CASSANDRA-12522)
  * Fail repair on non-existing table (CASSANDRA-12279)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/40c2d45c/pylib/cqlshlib/test/cassconnect.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/test/cassconnect.py 
b/pylib/cqlshlib/test/cassconnect.py
index 4a1311e..71f7565 100644
--- a/pylib/cqlshlib/test/cassconnect.py
+++ b/pylib/cqlshlib/test/cassconnect.py
@@ -116,6 +116,8 @@ def cassandra_cursor(cql_version=None, ks=''):
     conn = get_cassandra_connection(cql_version=cql_version)
     try:
         c = conn.connect(ks)
+        # increase default timeout to fix flacky tests, see CASSANDRA-12481
+        c.default_timeout = 60.0
         # if ks is not None:
         #     c.execute('USE %s;' % quote_name(c, ks))
         yield c

Reply via email to