From 40c2d45c5ed3828c8f5e3aebec673b81d231d465 Mon Sep 17 00:00:00 2001
From: Stefania Alborghetti <stefania.alborghetti@datastax.com>
Date: Wed, 31 Aug 2016 15:13:45 +0800
Subject: [PATCH] cqlshlib tests: increase default execute timeout

Patch by Stefania Alborghetti; reviewed by Philip Thompson for CASSANDRA-12481
---
 CHANGES.txt                        | 1 +
 pylib/cqlshlib/test/cassconnect.py | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index d7e9394cfa..a6a1114cd1 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)
diff --git a/pylib/cqlshlib/test/cassconnect.py b/pylib/cqlshlib/test/cassconnect.py
index 4a1311ecff..71f7565be9 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