[incubator-uniffle] branch master updated: [#1243] fix(test): Fix the flaky test `SparkSQLTest` and `RepartitionTest` (#1244)

[ckj]

This is an automated email from the ASF dual-hosted git repository.

ckj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-uniffle.git


The following commit(s) were added to refs/heads/master by this push:
     new b2154c722 [#1243] fix(test): Fix the flaky test `SparkSQLTest` and 
`RepartitionTest` (#1244)
b2154c722 is described below

commit b2154c722f30ee31a867561f550254842c33cbab
Author: summaryzb <summar...@gmail.com>
AuthorDate: Tue Oct 17 13:24:15 2023 -0500

    [#1243] fix(test): Fix the flaky test `SparkSQLTest` and `RepartitionTest` 
(#1244)
    
    ### What changes were proposed in this pull request?
    Remove static tmpDir field annotated with `@TempDir` of which their super 
class has the same field  with the same annotation
    
    ### Why are the changes needed?
    When both static tmpDir field annotated with `@TempDir` exists, the tmpDir 
of the super class is not initialized by the junit framework, then 
NullPointerException occurs when call 
`IntegrationTestBase.getShuffleServerConf()`
    
    https://github.com/apache/incubator-uniffle/issues/1243
    
    ### Does this PR introduce _any_ user-facing change?
    No.
    
    ### How was this patch tested?
    mvn -B   package 
-Dtest=org.apache.uniffle.test.SparkSQLWithDelegationShuffleManagerTest -Pspark3
    mvn -B   package 
-Dtest=org.apache.uniffle.test.RepartitionWithLocalFileRssTest -Pspark3
---
 .../src/test/java/org/apache/uniffle/test/RepartitionTest.java         | 3 ---
 .../src/test/java/org/apache/uniffle/test/SparkSQLTest.java            | 3 ---
 2 files changed, 6 deletions(-)

diff --git 
a/integration-test/spark-common/src/test/java/org/apache/uniffle/test/RepartitionTest.java
 
b/integration-test/spark-common/src/test/java/org/apache/uniffle/test/RepartitionTest.java
index a5d72a42f..a992509e6 100644
--- 
a/integration-test/spark-common/src/test/java/org/apache/uniffle/test/RepartitionTest.java
+++ 
b/integration-test/spark-common/src/test/java/org/apache/uniffle/test/RepartitionTest.java
@@ -32,7 +32,6 @@ import org.apache.spark.api.java.JavaPairRDD;
 import org.apache.spark.api.java.JavaRDD;
 import org.apache.spark.sql.SparkSession;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -40,8 +39,6 @@ public abstract class RepartitionTest extends 
SparkIntegrationTestBase {
 
   private static final Logger LOG = 
LoggerFactory.getLogger(RepartitionTest.class);
 
-  static @TempDir File tempDir;
-
   @Test
   public void resultCompareTest() throws Exception {
     run();
diff --git 
a/integration-test/spark-common/src/test/java/org/apache/uniffle/test/SparkSQLTest.java
 
b/integration-test/spark-common/src/test/java/org/apache/uniffle/test/SparkSQLTest.java
index 1231a6cd3..ec6160073 100644
--- 
a/integration-test/spark-common/src/test/java/org/apache/uniffle/test/SparkSQLTest.java
+++ 
b/integration-test/spark-common/src/test/java/org/apache/uniffle/test/SparkSQLTest.java
@@ -30,7 +30,6 @@ import org.apache.spark.sql.Dataset;
 import org.apache.spark.sql.Row;
 import org.apache.spark.sql.SparkSession;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -38,8 +37,6 @@ public abstract class SparkSQLTest extends 
SparkIntegrationTestBase {
 
   private static final Logger LOG = 
LoggerFactory.getLogger(SparkSQLTest.class);
 
-  static @TempDir File tempDir;
-
   @Test
   public void resultCompareTest() throws Exception {
     run();