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 611C0200BA6 for ; Mon, 12 Sep 2016 13:24:39 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 5FD3D160ADA; Mon, 12 Sep 2016 11:24:39 +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 AE519160AE0 for ; Mon, 12 Sep 2016 13:24:38 +0200 (CEST) Received: (qmail 35743 invoked by uid 500); 12 Sep 2016 11:24:37 -0000 Mailing-List: contact commits-help@kylin.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@kylin.apache.org Delivered-To: mailing list commits@kylin.apache.org Received: (qmail 35327 invoked by uid 99); 12 Sep 2016 11:24:37 -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; Mon, 12 Sep 2016 11:24:37 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 97065EEE38; Mon, 12 Sep 2016 11:24:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: lidong@apache.org To: commits@kylin.apache.org Date: Mon, 12 Sep 2016 11:24:52 -0000 Message-Id: <0b1a1c714334433288e49d5d1009de95@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [16/25] kylin git commit: minor, fix CI archived-at: Mon, 12 Sep 2016 11:24:39 -0000 minor, fix CI Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/5e95abde Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/5e95abde Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/5e95abde Branch: refs/heads/1.5.x-CDH5.7 Commit: 5e95abdec6da71a609cea80fa6569328b0c1e6cf Parents: 3450c0f Author: Hongbin Ma Authored: Sat Sep 10 19:26:29 2016 +0800 Committer: Hongbin Ma Committed: Sat Sep 10 19:26:42 2016 +0800 ---------------------------------------------------------------------- .../src/test/java/org/apache/kylin/query/ITKylinQueryTest.java | 5 +++++ 1 file changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/5e95abde/kylin-it/src/test/java/org/apache/kylin/query/ITKylinQueryTest.java ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/java/org/apache/kylin/query/ITKylinQueryTest.java b/kylin-it/src/test/java/org/apache/kylin/query/ITKylinQueryTest.java index 3411c91..de68c7a 100644 --- a/kylin-it/src/test/java/org/apache/kylin/query/ITKylinQueryTest.java +++ b/kylin-it/src/test/java/org/apache/kylin/query/ITKylinQueryTest.java @@ -121,6 +121,11 @@ public class ITKylinQueryTest extends KylinTestBase { @Test public void testTimeoutQuery() throws Exception { + if (HBaseStorage.overwriteStorageQuery != null) { + //v1 engine does not suit + return; + } + thrown.expect(SQLException.class); //should not break at table duplicate check, should fail at model duplicate check