From commits-return-206144-archive-asf-public=cust-asf.ponee.io@cassandra.apache.org Thu Feb 8 23:51:05 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 9383818064F for ; Thu, 8 Feb 2018 23:51:05 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 833F5160C5E; Thu, 8 Feb 2018 22:51:05 +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 D3030160C34 for ; Thu, 8 Feb 2018 23:51:04 +0100 (CET) Received: (qmail 39154 invoked by uid 500); 8 Feb 2018 22:51:03 -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 39132 invoked by uid 99); 8 Feb 2018 22:51:03 -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, 08 Feb 2018 22:51:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C9063DFC25; Thu, 8 Feb 2018 22:51:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dbrosius@apache.org To: commits@cassandra.apache.org Date: Thu, 08 Feb 2018 22:51:03 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] cassandra git commit: fix test due to change in exception message Repository: cassandra Updated Branches: refs/heads/cassandra-3.11 9d649d69a -> 43aa79d3c fix test due to change in exception message Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/40148a17 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/40148a17 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/40148a17 Branch: refs/heads/cassandra-3.11 Commit: 40148a178bd9b74b731591aa46b4158efb16b742 Parents: 7885a70 Author: Dave Brosius Authored: Thu Feb 8 17:49:40 2018 -0500 Committer: Dave Brosius Committed: Thu Feb 8 17:49:40 2018 -0500 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/cql3/ViewComplexTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/40148a17/test/unit/org/apache/cassandra/cql3/ViewComplexTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/ViewComplexTest.java b/test/unit/org/apache/cassandra/cql3/ViewComplexTest.java index d0f80f8..464cc39 100644 --- a/test/unit/org/apache/cassandra/cql3/ViewComplexTest.java +++ b/test/unit/org/apache/cassandra/cql3/ViewComplexTest.java @@ -424,7 +424,7 @@ public class ViewComplexTest extends CQLTester { execute("USE " + keyspace()); executeNet(protocolVersion, "USE " + keyspace()); - createTable("CREATE TABLE %s (k int, c int, a int, b int, l list, s set, m map, PRIMARY KEY (k, c))"); + String baseTableName = createTable("CREATE TABLE %s (k int, c int, a int, b int, l list, s set, m map, PRIMARY KEY (k, c))"); createView("mv", "CREATE MATERIALIZED VIEW %s AS SELECT a, b FROM %%s WHERE k IS NOT NULL AND c IS NOT NULL PRIMARY KEY (c, k)"); Keyspace ks = Keyspace.open(keyspace()); @@ -460,7 +460,7 @@ public class ViewComplexTest extends CQLTester assertRowsIgnoringOrder(execute("SELECT k,c,a,b from %s"), row(1, 1, null, null)); assertRowsIgnoringOrder(execute("SELECT * from mv"), row(1, 1, null, null)); - assertInvalidMessage("Cannot drop column m on base table with materialized views", "ALTER TABLE %s DROP m"); + assertInvalidMessage("Cannot drop column m on base table " + baseTableName + " with materialized views", "ALTER TABLE %s DROP m"); // executeNet(protocolVersion, "ALTER TABLE %s DROP m"); // ks.getColumnFamilyStore("mv").forceMajorCompaction(); // assertRowsIgnoringOrder(execute("SELECT k,c,a,b from %s WHERE k = 1 AND c = 1")); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org For additional commands, e-mail: commits-help@cassandra.apache.org