Skip to content

Commit f60cd7c

Browse files
kiszkdongjoon-hyun
authored andcommitted
[SPARK-25338][TEST] Ensure to call super.beforeAll() and super.afterAll() in test cases
## What changes were proposed in this pull request? This PR ensures to call `super.afterAll()` in `override afterAll()` method for test suites. * Some suites did not call `super.afterAll()` * Some suites may call `super.afterAll()` only under certain condition * Others never call `super.afterAll()`. This PR also ensures to call `super.beforeAll()` in `override beforeAll()` for test suites. ## How was this patch tested? Existing UTs Closes #22337 from kiszk/SPARK-25338. Authored-by: Kazuaki Ishizaki <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]>
1 parent a7e5aa6 commit f60cd7c

File tree

33 files changed

+216
-114
lines changed

33 files changed

+216
-114
lines changed

core/src/test/scala/org/apache/spark/deploy/master/ui/MasterWebUISuite.scala

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,11 @@ class MasterWebUISuite extends SparkFunSuite with BeforeAndAfterAll {
5353
}
5454

5555
override def afterAll() {
56-
masterWebUI.stop()
57-
super.afterAll()
56+
try {
57+
masterWebUI.stop()
58+
} finally {
59+
super.afterAll()
60+
}
5861
}
5962

6063
test("kill application") {

external/flume/src/test/scala/org/apache/spark/streaming/flume/FlumePollingStreamSuite.scala

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,18 @@ class FlumePollingStreamSuite extends SparkFunSuite with BeforeAndAfterAll with
5050
val utils = new PollingFlumeTestUtils
5151

5252
override def beforeAll(): Unit = {
53+
super.beforeAll()
5354
_sc = new SparkContext(conf)
5455
}
5556

5657
override def afterAll(): Unit = {
57-
if (_sc != null) {
58-
_sc.stop()
59-
_sc = null
58+
try {
59+
if (_sc != null) {
60+
_sc.stop()
61+
_sc = null
62+
}
63+
} finally {
64+
super.afterAll()
6065
}
6166
}
6267

external/kafka-0-10-sql/src/test/scala/org/apache/spark/sql/kafka010/KafkaRelationSuite.scala

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,12 @@ class KafkaRelationSuite extends QueryTest with SharedSQLContext with KafkaTest
4848
}
4949

5050
override def afterAll(): Unit = {
51-
if (testUtils != null) {
52-
testUtils.teardown()
53-
testUtils = null
51+
try {
52+
if (testUtils != null) {
53+
testUtils.teardown()
54+
testUtils = null
55+
}
56+
} finally {
5457
super.afterAll()
5558
}
5659
}

external/kafka-0-10-sql/src/test/scala/org/apache/spark/sql/kafka010/KafkaSinkSuite.scala

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,12 @@ class KafkaSinkSuite extends StreamTest with SharedSQLContext with KafkaTest {
4848
}
4949

5050
override def afterAll(): Unit = {
51-
if (testUtils != null) {
52-
testUtils.teardown()
53-
testUtils = null
51+
try {
52+
if (testUtils != null) {
53+
testUtils.teardown()
54+
testUtils = null
55+
}
56+
} finally {
5457
super.afterAll()
5558
}
5659
}

external/kafka-0-10/src/test/scala/org/apache/spark/streaming/kafka010/DirectKafkaStreamSuite.scala

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,19 @@ class DirectKafkaStreamSuite
5959
private var kafkaTestUtils: KafkaTestUtils = _
6060

6161
override def beforeAll {
62+
super.beforeAll()
6263
kafkaTestUtils = new KafkaTestUtils
6364
kafkaTestUtils.setup()
6465
}
6566

6667
override def afterAll {
67-
if (kafkaTestUtils != null) {
68-
kafkaTestUtils.teardown()
69-
kafkaTestUtils = null
68+
try {
69+
if (kafkaTestUtils != null) {
70+
kafkaTestUtils.teardown()
71+
kafkaTestUtils = null
72+
}
73+
} finally {
74+
super.afterAll()
7075
}
7176
}
7277

external/kafka-0-10/src/test/scala/org/apache/spark/streaming/kafka010/KafkaRDDSuite.scala

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,20 +44,27 @@ class KafkaRDDSuite extends SparkFunSuite with BeforeAndAfterAll {
4444
private var sc: SparkContext = _
4545

4646
override def beforeAll {
47+
super.beforeAll()
4748
sc = new SparkContext(sparkConf)
4849
kafkaTestUtils = new KafkaTestUtils
4950
kafkaTestUtils.setup()
5051
}
5152

5253
override def afterAll {
53-
if (sc != null) {
54-
sc.stop
55-
sc = null
56-
}
57-
58-
if (kafkaTestUtils != null) {
59-
kafkaTestUtils.teardown()
60-
kafkaTestUtils = null
54+
try {
55+
try {
56+
if (sc != null) {
57+
sc.stop
58+
sc = null
59+
}
60+
} finally {
61+
if (kafkaTestUtils != null) {
62+
kafkaTestUtils.teardown()
63+
kafkaTestUtils = null
64+
}
65+
}
66+
} finally {
67+
super.afterAll()
6168
}
6269
}
6370

external/kafka-0-8/src/test/scala/org/apache/spark/streaming/kafka/DirectKafkaStreamSuite.scala

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,19 @@ class DirectKafkaStreamSuite
5757
private var kafkaTestUtils: KafkaTestUtils = _
5858

5959
override def beforeAll {
60+
super.beforeAll()
6061
kafkaTestUtils = new KafkaTestUtils
6162
kafkaTestUtils.setup()
6263
}
6364

6465
override def afterAll {
65-
if (kafkaTestUtils != null) {
66-
kafkaTestUtils.teardown()
67-
kafkaTestUtils = null
66+
try {
67+
if (kafkaTestUtils != null) {
68+
kafkaTestUtils.teardown()
69+
kafkaTestUtils = null
70+
}
71+
} finally {
72+
super.afterAll()
6873
}
6974
}
7075

external/kafka-0-8/src/test/scala/org/apache/spark/streaming/kafka/KafkaClusterSuite.scala

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ class KafkaClusterSuite extends SparkFunSuite with BeforeAndAfterAll {
3232
private var kafkaTestUtils: KafkaTestUtils = _
3333

3434
override def beforeAll() {
35+
super.beforeAll()
3536
kafkaTestUtils = new KafkaTestUtils
3637
kafkaTestUtils.setup()
3738

@@ -41,9 +42,13 @@ class KafkaClusterSuite extends SparkFunSuite with BeforeAndAfterAll {
4142
}
4243

4344
override def afterAll() {
44-
if (kafkaTestUtils != null) {
45-
kafkaTestUtils.teardown()
46-
kafkaTestUtils = null
45+
try {
46+
if (kafkaTestUtils != null) {
47+
kafkaTestUtils.teardown()
48+
kafkaTestUtils = null
49+
}
50+
} finally {
51+
super.afterAll()
4752
}
4853
}
4954

external/kafka-0-8/src/test/scala/org/apache/spark/streaming/kafka/KafkaRDDSuite.scala

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,27 @@ class KafkaRDDSuite extends SparkFunSuite with BeforeAndAfterAll {
3535
private var sc: SparkContext = _
3636

3737
override def beforeAll {
38+
super.beforeAll()
3839
sc = new SparkContext(sparkConf)
3940
kafkaTestUtils = new KafkaTestUtils
4041
kafkaTestUtils.setup()
4142
}
4243

4344
override def afterAll {
44-
if (sc != null) {
45-
sc.stop
46-
sc = null
47-
}
48-
49-
if (kafkaTestUtils != null) {
50-
kafkaTestUtils.teardown()
51-
kafkaTestUtils = null
45+
try {
46+
try {
47+
if (sc != null) {
48+
sc.stop
49+
sc = null
50+
}
51+
} finally {
52+
if (kafkaTestUtils != null) {
53+
kafkaTestUtils.teardown()
54+
kafkaTestUtils = null
55+
}
56+
}
57+
} finally {
58+
super.afterAll()
5259
}
5360
}
5461

external/kafka-0-8/src/test/scala/org/apache/spark/streaming/kafka/KafkaStreamSuite.scala

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,26 @@ class KafkaStreamSuite extends SparkFunSuite with Eventually with BeforeAndAfter
3535
private var kafkaTestUtils: KafkaTestUtils = _
3636

3737
override def beforeAll(): Unit = {
38+
super.beforeAll()
3839
kafkaTestUtils = new KafkaTestUtils
3940
kafkaTestUtils.setup()
4041
}
4142

4243
override def afterAll(): Unit = {
43-
if (ssc != null) {
44-
ssc.stop()
45-
ssc = null
46-
}
47-
48-
if (kafkaTestUtils != null) {
49-
kafkaTestUtils.teardown()
50-
kafkaTestUtils = null
44+
try {
45+
try {
46+
if (ssc != null) {
47+
ssc.stop()
48+
ssc = null
49+
}
50+
} finally {
51+
if (kafkaTestUtils != null) {
52+
kafkaTestUtils.teardown()
53+
kafkaTestUtils = null
54+
}
55+
}
56+
} finally {
57+
super.afterAll()
5158
}
5259
}
5360

0 commit comments

Comments
 (0)