Fix tests

Author: zsxwing

sql/core/src/test/scala/org/apache/spark/sql/SessionStateSuite.scala

@@ -44,6 +44,12 @@ class SessionStateSuite extends SparkFunSuite
     createSession()
   }
 
+  override def afterAll(): Unit = {
+    if (sparkContext != null) {
+      sparkContext.stop()
+    }
+  }
+
   test("fork new session and inherit RuntimeConfig options") {
     val key = "spark-config-clone"
     activeSession.conf.set(key, "active")

sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveSessionStateSuite.scala

@@ -28,20 +28,12 @@ import org.apache.spark.sql.hive.test.TestHiveSingleton
 class HiveSessionStateSuite extends SessionStateSuite
   with TestHiveSingleton with BeforeAndAfterEach {
 
-  override def beforeEach(): Unit = {
-    createSession()
-  }
-
   override def afterEach(): Unit = {}
 
   override def beforeAll(): Unit = {}
 
   override def afterAll(): Unit = {
-    try {
-      hiveContext.reset()
-    } finally {
-      super.afterAll()
-    }
+    hiveContext.reset()
   }
 
   override def createSession(): Unit = {