Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 22658200B85 for ; Thu, 1 Sep 2016 04:24:33 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 14251160AC4; Thu, 1 Sep 2016 02:24:23 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 59896160AB4 for ; Thu, 1 Sep 2016 04:24:22 +0200 (CEST) Received: (qmail 92645 invoked by uid 500); 1 Sep 2016 02:24:11 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 92599 invoked by uid 99); 1 Sep 2016 02:24:11 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Sep 2016 02:24:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 89511E0551; Thu, 1 Sep 2016 02:24:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: stefania@apache.org To: commits@cassandra.apache.org Date: Thu, 01 Sep 2016 02:24:11 -0000 Message-Id: In-Reply-To: <58a60b9621394f3789dc4f34b8f74b09@git.apache.org> References: <58a60b9621394f3789dc4f34b8f74b09@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/6] cassandra git commit: cqlshlib tests: increase default execute timeout archived-at: Thu, 01 Sep 2016 02:24:33 -0000 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.0 Commit: 40c2d45c5ed3828c8f5e3aebec673b81d231d465 Parents: 77924b3 Author: Stefania Alborghetti Authored: Wed Aug 31 15:13:45 2016 +0800 Committer: Stefania Alborghetti 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