Repository: incubator-atlas Updated Branches: refs/heads/master e13fa5ecd -> 079ce35ef
ATLAS-1003 DataSetLineageServiceTest, GraphBackedDiscoveryServiceTest, and GraphRepoMapperScaleTest failing in some environments (dkantor via shwethags) Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/80051c9e Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/80051c9e Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/80051c9e Branch: refs/heads/master Commit: 80051c9e846101130f29956db459d8d4243e2bd4 Parents: e13fa5e Author: Shwetha GS <[email protected]> Authored: Wed Jul 13 10:19:25 2016 +0530 Committer: Shwetha GS <[email protected]> Committed: Wed Jul 13 10:19:25 2016 +0530 ---------------------------------------------------------------------- release-log.txt | 1 + .../typestore/GraphBackedTypeStoreTest.java | 6 ++++- ...StoreBackedTypeCacheMetadataServiceTest.java | 27 +++++++++++++++++++- .../org/apache/atlas/query/GremlinTest.scala | 7 ++++- .../apache/atlas/query/LineageQueryTest.scala | 7 ++++- 5 files changed, 44 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/80051c9e/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 4c58bdc..ae4a3c1 100644 --- a/release-log.txt +++ b/release-log.txt @@ -6,6 +6,7 @@ INCOMPATIBLE CHANGES: ALL CHANGES: +ATLAS-1003 DataSetLineageServiceTest, GraphBackedDiscoveryServiceTest, and GraphRepoMapperScaleTest failing in some environments (dkantor via shwethags) ATLAS-1002 Create default user rangertagsync in atlas file authentication for Ranger tag sync module (nixonrodrigues via shwethags) ATLAS-949 UI improvement for modal and tag styling in table (Kalyanikashikar via shwethags) ATLAS-936 Update atlas website for 0.7 release (shwethags) http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/80051c9e/repository/src/test/java/org/apache/atlas/repository/typestore/GraphBackedTypeStoreTest.java ---------------------------------------------------------------------- diff --git a/repository/src/test/java/org/apache/atlas/repository/typestore/GraphBackedTypeStoreTest.java b/repository/src/test/java/org/apache/atlas/repository/typestore/GraphBackedTypeStoreTest.java index da47dc1..789c0fe 100755 --- a/repository/src/test/java/org/apache/atlas/repository/typestore/GraphBackedTypeStoreTest.java +++ b/repository/src/test/java/org/apache/atlas/repository/typestore/GraphBackedTypeStoreTest.java @@ -86,7 +86,11 @@ public class GraphBackedTypeStoreTest { @AfterClass public void tearDown() throws Exception { ts.reset(); - graphProvider.get().shutdown(); + try { + graphProvider.get().shutdown(); + } catch (Exception e) { + e.printStackTrace(); + } try { TitanCleanup.clear(graphProvider.get()); } catch(Exception e) { http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/80051c9e/repository/src/test/java/org/apache/atlas/service/StoreBackedTypeCacheMetadataServiceTest.java ---------------------------------------------------------------------- diff --git a/repository/src/test/java/org/apache/atlas/service/StoreBackedTypeCacheMetadataServiceTest.java b/repository/src/test/java/org/apache/atlas/service/StoreBackedTypeCacheMetadataServiceTest.java index 4cb5c67..7885782 100644 --- a/repository/src/test/java/org/apache/atlas/service/StoreBackedTypeCacheMetadataServiceTest.java +++ b/repository/src/test/java/org/apache/atlas/service/StoreBackedTypeCacheMetadataServiceTest.java @@ -18,6 +18,7 @@ package org.apache.atlas.service; import org.apache.atlas.TestUtils; +import org.apache.atlas.repository.graph.GraphProvider; import org.apache.atlas.repository.typestore.ITypeStore; import org.apache.atlas.repository.typestore.StoreBackedTypeCache; import org.apache.atlas.repository.typestore.StoreBackedTypeCacheTestModule; @@ -25,12 +26,15 @@ import org.apache.atlas.services.MetadataService; import org.apache.atlas.typesystem.types.TypeSystem; import org.apache.atlas.typesystem.types.cache.TypeCache; import org.testng.Assert; +import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.Guice; import org.testng.annotations.Test; import com.google.common.collect.ImmutableList; import com.google.inject.Inject; +import com.thinkaurelius.titan.core.TitanGraph; +import com.thinkaurelius.titan.core.util.TitanCleanup; /** @@ -47,9 +51,12 @@ public class StoreBackedTypeCacheMetadataServiceTest @Inject private ITypeStore typeStore; - @Inject + @Inject TypeCache typeCache; + @Inject + private GraphProvider<TitanGraph> graphProvider; + private TypeSystem ts; @BeforeClass @@ -65,6 +72,24 @@ public class StoreBackedTypeCacheMetadataServiceTest ts.reset(); } + @AfterClass + public void tearDown() throws Exception { + ts.reset(); + try { + graphProvider.get().shutdown(); + } + catch(Exception e) { + e.printStackTrace(); + } + + try { + TitanCleanup.clear(graphProvider.get()); + } + catch(Exception e) { + e.printStackTrace(); + } + } + @Test public void testIt() throws Exception { Assert.assertTrue(typeCache instanceof StoreBackedTypeCache); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/80051c9e/repository/src/test/scala/org/apache/atlas/query/GremlinTest.scala ---------------------------------------------------------------------- diff --git a/repository/src/test/scala/org/apache/atlas/query/GremlinTest.scala b/repository/src/test/scala/org/apache/atlas/query/GremlinTest.scala index b23c0f6..8fbcdbc 100755 --- a/repository/src/test/scala/org/apache/atlas/query/GremlinTest.scala +++ b/repository/src/test/scala/org/apache/atlas/query/GremlinTest.scala @@ -43,7 +43,12 @@ class GremlinTest extends BaseGremlinTest { @AfterClass def afterAll() { - g.shutdown() + try { + g.shutdown() + } catch { + case ex: Exception => + print("Could not shutdown the graph ", ex); + } try { TitanCleanup.clear(g); } catch { http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/80051c9e/repository/src/test/scala/org/apache/atlas/query/LineageQueryTest.scala ---------------------------------------------------------------------- diff --git a/repository/src/test/scala/org/apache/atlas/query/LineageQueryTest.scala b/repository/src/test/scala/org/apache/atlas/query/LineageQueryTest.scala index 0e0ac86..021a8d2 100755 --- a/repository/src/test/scala/org/apache/atlas/query/LineageQueryTest.scala +++ b/repository/src/test/scala/org/apache/atlas/query/LineageQueryTest.scala @@ -43,7 +43,12 @@ class LineageQueryTest extends BaseGremlinTest { @AfterClass def afterAll() { - g.shutdown() + try { + g.shutdown() + } catch { + case ex: Exception => + print("Could not shutdown the graph ", ex); + } try { TitanCleanup.clear(g); } catch {
