From 7ab3acbcd70051dd7a9f1f360c7db8b635f426f7 Mon Sep 17 00:00:00 2001 From: HyukjinKwon Date: Fri, 24 Jul 2020 13:29:11 +0900 Subject: [PATCH 1/3] Enable crossPaths back to prevent side effects --- project/SparkBuild.scala | 2 -- 1 file changed, 2 deletions(-) diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index c05e41cfcc0c2..bb5dead44be2c 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -1039,8 +1039,6 @@ object TestSettings { Seq("-eNCXEHLOPQMDF") }.getOrElse(Nil): _*), testOptions in Test += Tests.Argument(TestFrameworks.JUnit, "-v", "-a"), - // Required to detect Junit tests for each project, see also https://github.com/sbt/junit-interface/issues/35 - crossPaths := false, // Enable Junit testing. libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test", // `parallelExecutionInTest` controls whether test suites belonging to the same SBT project From 5e79db685e968029994fe76582862581c3800985 Mon Sep 17 00:00:00 2001 From: HyukjinKwon Date: Fri, 24 Jul 2020 14:49:27 +0900 Subject: [PATCH 2/3] Revert "[SPARK-32253][INFRA] Show errors only for the sbt tests of github actions" This reverts commit 026b0b926dfd40038f2cee932f38b917eb25b77e. --- dev/run-tests.py | 3 --- project/SparkBuild.scala | 7 ------- 2 files changed, 10 deletions(-) diff --git a/dev/run-tests.py b/dev/run-tests.py index 8e29f89c3a0d0..065a27c0e853b 100755 --- a/dev/run-tests.py +++ b/dev/run-tests.py @@ -653,9 +653,6 @@ def main(): # If we're running the tests in Github Actions, attempt to detect and test # only the affected modules. if test_env == "github_actions": - # Set the log level of sbt as ERROR to make the output more readable. - if build_tool == "sbt": - extra_profiles.append("--error") if os.environ["GITHUB_BASE_REF"] != "": # Pull requests changed_files = identify_changed_files_from_git_commits( diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index bb5dead44be2c..5a3ac213c2057 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -1031,13 +1031,6 @@ object TestSettings { }.getOrElse(Nil): _*), // Show full stack trace and duration in test cases. testOptions in Test += Tests.Argument("-oDF"), - // Show only the failed test cases with full stack traces in github action to make the log more - // readable. - // Check https://www.scalatest.org/user_guide/using_the_runner for the details of options . - testOptions in Test += Tests.Argument(TestFrameworks.ScalaTest, - sys.env.get("GITHUB_ACTIONS").map { _ => - Seq("-eNCXEHLOPQMDF") - }.getOrElse(Nil): _*), testOptions in Test += Tests.Argument(TestFrameworks.JUnit, "-v", "-a"), // Enable Junit testing. libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test", From eb78237cbe2d2a406152fed91178abd78cef5736 Mon Sep 17 00:00:00 2001 From: HyukjinKwon Date: Fri, 24 Jul 2020 14:49:58 +0900 Subject: [PATCH 3/3] Revert "Revert "[SPARK-32253][INFRA] Show errors only for the sbt tests of github actions"" This reverts commit 5e79db685e968029994fe76582862581c3800985. --- dev/run-tests.py | 3 +++ project/SparkBuild.scala | 7 +++++++ 2 files changed, 10 insertions(+) diff --git a/dev/run-tests.py b/dev/run-tests.py index 065a27c0e853b..8e29f89c3a0d0 100755 --- a/dev/run-tests.py +++ b/dev/run-tests.py @@ -653,6 +653,9 @@ def main(): # If we're running the tests in Github Actions, attempt to detect and test # only the affected modules. if test_env == "github_actions": + # Set the log level of sbt as ERROR to make the output more readable. + if build_tool == "sbt": + extra_profiles.append("--error") if os.environ["GITHUB_BASE_REF"] != "": # Pull requests changed_files = identify_changed_files_from_git_commits( diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 5a3ac213c2057..bb5dead44be2c 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -1031,6 +1031,13 @@ object TestSettings { }.getOrElse(Nil): _*), // Show full stack trace and duration in test cases. testOptions in Test += Tests.Argument("-oDF"), + // Show only the failed test cases with full stack traces in github action to make the log more + // readable. + // Check https://www.scalatest.org/user_guide/using_the_runner for the details of options . + testOptions in Test += Tests.Argument(TestFrameworks.ScalaTest, + sys.env.get("GITHUB_ACTIONS").map { _ => + Seq("-eNCXEHLOPQMDF") + }.getOrElse(Nil): _*), testOptions in Test += Tests.Argument(TestFrameworks.JUnit, "-v", "-a"), // Enable Junit testing. libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test",