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 1F3A2200D3A for ; Wed, 15 Nov 2017 22:46:37 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 1D982160C0A; Wed, 15 Nov 2017 21:46:37 +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 636F0160BF6 for ; Wed, 15 Nov 2017 22:46:36 +0100 (CET) Received: (qmail 2867 invoked by uid 500); 15 Nov 2017 21:46:31 -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 2685 invoked by uid 99); 15 Nov 2017 21:46:31 -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; Wed, 15 Nov 2017 21:46:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 567A5F5E7D; Wed, 15 Nov 2017 21:46:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aweisberg@apache.org To: commits@cassandra.apache.org Date: Wed, 15 Nov 2017 21:46:45 -0000 Message-Id: In-Reply-To: <7b6f5caba1744195b9d4ab4d41a9d308@git.apache.org> References: <7b6f5caba1744195b9d4ab4d41a9d308@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [17/50] cassandra git commit: Restore <4.0 compatibility for digest mismatch log message matching archived-at: Wed, 15 Nov 2017 21:46:37 -0000 Restore <4.0 compatibility for digest mismatch log message matching Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/61cbd5cd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/61cbd5cd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/61cbd5cd Branch: refs/heads/master Commit: 61cbd5cdcb435503bcb828249cce60ca779995e0 Parents: 459943a Author: Stefan Podkowinski Authored: Thu Aug 10 09:02:24 2017 +0200 Committer: Stefan Podkowinski Committed: Thu Aug 10 09:02:24 2017 +0200 ---------------------------------------------------------------------- materialized_views_test.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/61cbd5cd/materialized_views_test.py ---------------------------------------------------------------------- diff --git a/materialized_views_test.py b/materialized_views_test.py index 79679ca..574d90f 100644 --- a/materialized_views_test.py +++ b/materialized_views_test.py @@ -1063,8 +1063,9 @@ class TestMaterializedViews(Tester): # execution happening # Look for messages like: - # Digest mismatch: Mismatch for key DecoratedKey - regex = r"Digest mismatch: Mismatch for key DecoratedKey" + # 4.0+ Digest mismatch: Mismatch for key DecoratedKey + # <4.0 Digest mismatch: org.apache.cassandra.service.DigestMismatchException: Mismatch for key DecoratedKey + regex = r"Digest mismatch: ([a-zA-Z.]+:\s)?Mismatch for key DecoratedKey" for event in trace.events: desc = event.description match = re.match(regex, desc) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org For additional commands, e-mail: commits-help@cassandra.apache.org