ATLAS-1003 DataSetLineageServiceTest, GraphBackedDiscoveryServiceTest, and…

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)

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();
+        try {
             graphProvider.get().shutdown();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         try {
             TitanCleanup.clear(graphProvider.get());
         } catch(Exception e) {

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;
 
 
 /**
@@ -50,6 +54,9 @@ public class StoreBackedTypeCacheMetadataServiceTest
     @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);

repository/src/test/scala/org/apache/atlas/query/GremlinTest.scala

@@ -43,7 +43,12 @@ class GremlinTest extends BaseGremlinTest {
 
   @AfterClass
   def afterAll() {
+    try {
         g.shutdown()
+    } catch {
+      case ex: Exception =>
+        print("Could not shutdown the graph ", ex);
+    }
     try {
       TitanCleanup.clear(g);
     } catch {

repository/src/test/scala/org/apache/atlas/query/LineageQueryTest.scala

@@ -43,7 +43,12 @@ class LineageQueryTest extends BaseGremlinTest {
 
     @AfterClass
     def afterAll() {
+      try {
           g.shutdown()
+      } catch {
+        case ex: Exception =>
+          print("Could not shutdown the graph ", ex);
+      }
       try {
         TitanCleanup.clear(g);
       } catch {