From 43a33350904ffffabe149fb7d6b3dad00ddc2542 Mon Sep 17 00:00:00 2001
From: Matei Zaharia <matei@eecs.berkeley.edu>
Date: Sun, 5 Feb 2012 22:46:51 -0800
Subject: [PATCH] Simplifying test
---
core/src/test/scala/spark/FailureSuite.scala | 22 +++++++-------------
1 file changed, 7 insertions(+), 15 deletions(-)
diff --git a/core/src/test/scala/spark/FailureSuite.scala b/core/src/test/scala/spark/FailureSuite.scala
index a6ce59d986..ab21f6a6f0 100644
--- a/core/src/test/scala/spark/FailureSuite.scala
+++ b/core/src/test/scala/spark/FailureSuite.scala
@@ -14,7 +14,7 @@ object FailureSuiteState {
var tasksRun = 0
var tasksFailed = 0
- def clear() {
+ def clear(): Unit = synchronized {
tasksRun = 0
tasksFailed = 0
}
@@ -28,13 +28,9 @@ class FailureSuite extends FunSuite {
val results = sc.makeRDD(1 to 3, 3).map { x =>
FailureSuiteState.synchronized {
FailureSuiteState.tasksRun += 1
- }
- if (x == 1) {
- FailureSuiteState.synchronized {
- if (FailureSuiteState.tasksFailed == 0) {
- FailureSuiteState.tasksFailed += 1
- throw new Exception("Intentional task failure")
- }
+ if (x == 1 && FailureSuiteState.tasksFailed == 0) {
+ FailureSuiteState.tasksFailed += 1
+ throw new Exception("Intentional task failure")
}
}
x * x
@@ -54,13 +50,9 @@ class FailureSuite extends FunSuite {
case (k, v) =>
FailureSuiteState.synchronized {
FailureSuiteState.tasksRun += 1
- }
- if (k == 1) {
- FailureSuiteState.synchronized {
- if (FailureSuiteState.tasksFailed == 0) {
- FailureSuiteState.tasksFailed += 1
- throw new Exception("Intentional task failure")
- }
+ if (k == 1 && FailureSuiteState.tasksFailed == 0) {
+ FailureSuiteState.tasksFailed += 1
+ throw new Exception("Intentional task failure")
}
}
(k, v(0) * v(0))
--
GitLab