natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cqlshlib tests: increase default execute timeout 

Patch by Stefania Alborghetti; reviewed by Philip Thompson for CASSANDRA-12481
This commit is contained in:
Stefania Alborghetti 2016-08-31 15:13:45 +08:00
parent 77924b37c9
commit 40c2d45c5e
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -1,4 +1,5 @@
2.2.8 2.2.8
* cqlshlib tests: increase default execute timeout (CASSANDRA-12481)
* Forward writes to replacement node when replace_address != broadcast_address (CASSANDRA-8523) * 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) * Enable repair -pr and -local together (fix regression of CASSANDRA-7450) (CASSANDRA-12522)
* Fail repair on non-existing table (CASSANDRA-12279) * Fail repair on non-existing table (CASSANDRA-12279)

2
pylib/cqlshlib/test/cassconnect.py
View File

@ -116,6 +116,8 @@ def cassandra_cursor(cql_version=None, ks=''):
conn = get_cassandra_connection(cql_version=cql_version) conn = get_cassandra_connection(cql_version=cql_version)
try: try:
c = conn.connect(ks) c = conn.connect(ks)
# increase default timeout to fix flacky tests, see CASSANDRA-12481
c.default_timeout = 60.0
# if ks is not None: # if ks is not None:
# c.execute('USE %s;' % quote_name(c, ks)) # c.execute('USE %s;' % quote_name(c, ks))
yield c yield c