Repository: kylin Updated Branches: refs/heads/master 466cf1afb -> 942406bda
KYLIN-1922 imporve CI Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/942406bd Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/942406bd Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/942406bd Branch: refs/heads/master Commit: 942406bda3ec7405a6d2be27ba11bb38b5f88298 Parents: 466cf1a Author: Hongbin Ma <mahong...@apache.org> Authored: Fri Sep 9 23:01:00 2016 +0800 Committer: Hongbin Ma <mahong...@apache.org> Committed: Fri Sep 9 23:01:00 2016 +0800 ---------------------------------------------------------------------- .../apache/kylin/query/ITKylinQueryTest.java | 22 ++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/942406bd/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 5f6af7a..3411c91 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 @@ -44,6 +44,8 @@ import org.apache.kylin.storage.hbase.HBaseStorage; import org.apache.kylin.storage.hbase.cube.v1.coprocessor.observer.ObserverEnabler; import org.dbunit.database.DatabaseConnection; import org.dbunit.database.IDatabaseConnection; +import org.hamcrest.BaseMatcher; +import org.hamcrest.Description; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Ignore; @@ -119,6 +121,22 @@ public class ITKylinQueryTest extends KylinTestBase { @Test public void testTimeoutQuery() throws Exception { + thrown.expect(SQLException.class); + + //should not break at table duplicate check, should fail at model duplicate check + thrown.expectCause(new BaseMatcher<Throwable>() { + @Override + public boolean matches(Object item) { + if (item instanceof GTScanSelfTerminatedException) { + return true; + } + return false; + } + + @Override + public void describeTo(Description description) { + } + }); try { @@ -133,10 +151,6 @@ public class ITKylinQueryTest extends KylinTestBase { RemoveBlackoutRealizationsRule.blackouts.add("CUBE[name=test_kylin_cube_without_slr_inner_join_empty]"); execAndCompQuery(getQueryFolderPrefix() + "src/test/resources/query/sql_timeout", null, true); - } catch (SQLException e) { - if (!(e.getCause() instanceof GTScanSelfTerminatedException)) { - throw new RuntimeException(); - } } finally { //these two cubes has RAW measure, will disturb limit push down
