Skip to content

reset SPARK_TESTING to avoid loading Log4J configurations in testing cl... #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 9, 2014
Merged

reset SPARK_TESTING to avoid loading Log4J configurations in testing cl... #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions ...server/src/test/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2Suite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import java.sql.{DriverManager, Statement}
import java.util.concurrent.TimeoutException

import scala.collection.mutable.ArrayBuffer
import scala.collection.JavaConversions._
import scala.concurrent.duration._
import scala.concurrent.{Await, Promise}
import scala.sys.process.{Process, ProcessLogger}
Expand All @@ -43,11 +42,6 @@ class HiveThriftServer2Suite extends FunSuite with Logging {
Class.forName(classOf[HiveDriver].getCanonicalName)

val verbose = Option(System.getenv("SPARK_SQL_TEST_VERBOSE")).isDefined
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

verbose not used

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this can be removed, I'll take care of this.

// Since we use info to assert server process started successfully,
// make sure that log4j level is INFO
org.apache.log4j.LogManager.getCurrentLoggers.foreach { log =>
log.asInstanceOf[org.apache.log4j.Logger].setLevel(org.apache.log4j.Level.INFO)
}

def startThriftServerWithin(timeout: FiniteDuration = 1.minute)(f: Statement => Unit) {
Thread.sleep(5000)
Expand Down Expand Up @@ -100,8 +94,8 @@ class HiveThriftServer2Suite extends FunSuite with Logging {
.run(ProcessLogger(captureLogOutput, _ => ()))
}
}

Process(command).run(ProcessLogger(
// reset SPARK_TESTING to avoid loading Log4J configurations in testing class paths
Process(command, None, ("SPARK_TESTING", "0")).run(ProcessLogger(
captureThriftServerOutput("stdout"),
captureThriftServerOutput("stderr")))

Expand Down