Repository: spark
Updated Branches:
refs/heads/branch-1.6 fa86dc47a -> b3a512965
[SPARK-13601] [TESTS] use 1 partition in tests to avoid race conditions
Fix race conditions when cleanup files.
Existing tests.
Author: Davies Liu <dav...@databricks.com>
Closes #11507 from davies/flaky.
(cherry picked from commit d062587dd2c4ed13998ee8bcc9d08f29734df228)
Signed-off-by: Davies Liu <davies....@gmail.com>
Conflicts:
sql/hive/src/test/scala/org/apache/spark/sql/sources/CommitFailureTestRelationSuite.scala
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/b3a51296
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/b3a51296
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/b3a51296
Branch: refs/heads/branch-1.6
Commit: b3a512965d9c27a7078448a6e8eae9ecfcaf1553
Parents: fa86dc4
Author: Davies Liu <dav...@databricks.com>
Authored: Thu Mar 3 17:46:28 2016 -0800
Committer: Davies Liu <davies....@gmail.com>
Committed: Thu Mar 3 17:47:56 2016 -0800
----------------------------------------------------------------------
.../spark/sql/sources/CommitFailureTestRelationSuite.scala | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/b3a51296/sql/hive/src/test/scala/org/apache/spark/sql/sources/CommitFailureTestRelationSuite.scala
----------------------------------------------------------------------
diff --git
a/sql/hive/src/test/scala/org/apache/spark/sql/sources/CommitFailureTestRelationSuite.scala
b/sql/hive/src/test/scala/org/apache/spark/sql/sources/CommitFailureTestRelationSuite.scala
index 793be8d..8438349 100644
---
a/sql/hive/src/test/scala/org/apache/spark/sql/sources/CommitFailureTestRelationSuite.scala
+++
b/sql/hive/src/test/scala/org/apache/spark/sql/sources/CommitFailureTestRelationSuite.scala
@@ -51,7 +51,7 @@ class CommitFailureTestRelationSuite extends SQLTestUtils
with TestHiveSingleton
withTempPath { file =>
// fail the job in the middle of writing
val divideByZero = udf((x: Int) => { x / (x - 1)})
- val df = sqlContext.range(0, 10).select(divideByZero(col("id")))
+ val df = sqlContext.range(0,
10).coalesce(1).select(divideByZero(col("id")))
SimpleTextRelation.callbackCalled = false
intercept[SparkException] {
@@ -67,7 +67,8 @@ class CommitFailureTestRelationSuite extends SQLTestUtils
with TestHiveSingleton
test("call failure callbacks before close writer - partitioned") {
SimpleTextRelation.failCommitter = false
withTempPath { file =>
- val df = sqlContext.range(0, 10).select(col("id").mod(2).as("key"),
col("id"))
+ // fail the job in the middle of writing
+ val df = sqlContext.range(0,
10).coalesce(1).select(col("id").mod(2).as("key"), col("id"))
SimpleTextRelation.callbackCalled = false
SimpleTextRelation.failWriter = true
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
