Repository: ignite Updated Branches: refs/heads/ignite-2.7 99723897b -> ba7833c05
IGNITE-9639: Fixed flaky failures in SqlSystemViewsSelfTest. This closes #4787. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ba7833c0 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ba7833c0 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ba7833c0 Branch: refs/heads/ignite-2.7 Commit: ba7833c05da02a216fef9574a5b5b3d9d3c9715e Parents: 9972389 Author: Aleksey Plekhanov <plehanov.a...@gmail.com> Authored: Thu Sep 27 10:53:08 2018 +0300 Committer: devozerov <voze...@gridgain.com> Committed: Thu Sep 27 10:54:20 2018 +0300 ---------------------------------------------------------------------- .../internal/processors/query/SqlSystemViewsSelfTest.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ba7833c0/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlSystemViewsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlSystemViewsSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlSystemViewsSelfTest.java index 1a4dae7..ccd0796 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlSystemViewsSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlSystemViewsSelfTest.java @@ -73,7 +73,7 @@ public class SqlSystemViewsSelfTest extends GridCommonAbstractTest { */ @SuppressWarnings("unchecked") private List<List<?>> execSql(Ignite ignite, String sql, Object ... args) { - IgniteCache cache = ignite.getOrCreateCache(DEFAULT_CACHE_NAME); + IgniteCache cache = ignite.cache(DEFAULT_CACHE_NAME); SqlFieldsQuery qry = new SqlFieldsQuery(sql); @@ -114,7 +114,7 @@ public class SqlSystemViewsSelfTest extends GridCommonAbstractTest { * Test system views modifications. */ public void testModifications() throws Exception { - startGrid(); + startGrid(getConfiguration()); assertSqlError("DROP TABLE IGNITE.NODES"); @@ -499,6 +499,11 @@ public class SqlSystemViewsSelfTest extends GridCommonAbstractTest { assertEquals("node2", res.get(0).get(0)); } + /** {@inheritDoc} */ + @Override protected IgniteConfiguration getConfiguration() throws Exception { + return super.getConfiguration().setCacheConfiguration(new CacheConfiguration().setName(DEFAULT_CACHE_NAME)); + } + /** * Gets ignite configuration with persistence enabled. */
