diff --git a/scalding-core/src/main/scala/com/twitter/scalding/JobTest.scala b/scalding-core/src/main/scala/com/twitter/scalding/JobTest.scala index ccee5e892b..58f308386d 100644 --- a/scalding-core/src/main/scala/com/twitter/scalding/JobTest.scala +++ b/scalding-core/src/main/scala/com/twitter/scalding/JobTest.scala @@ -22,6 +22,7 @@ import cascading.tuple.Tuple import cascading.tuple.TupleEntry import cascading.stats.CascadingStats import org.apache.hadoop.conf.Configuration +import org.apache.hadoop.mapred.JobConf import scala.util.Try @@ -187,7 +188,7 @@ class JobTest(cons: (Args) => Job) { // Create a global mode to use for testing. val testMode: TestMode = if (useHadoop) { - val conf = optConfig.getOrElse(new Configuration) + val conf = optConfig.getOrElse(new JobConf) // Set the polling to a lower value to speed up tests: conf.set("jobclient.completion.poll.interval", "100") conf.set("cascading.flow.job.pollinginterval", "5") diff --git a/scalding-core/src/test/scala/com/twitter/scalding/JobTestTest.scala b/scalding-core/src/test/scala/com/twitter/scalding/JobTestTest.scala index 1179bb956b..6f9a891d29 100644 --- a/scalding-core/src/test/scala/com/twitter/scalding/JobTestTest.scala +++ b/scalding-core/src/test/scala/com/twitter/scalding/JobTestTest.scala @@ -35,5 +35,10 @@ class JobTestTest extends WordSpec with Matchers { runJobTest() } should have message (s"Failed to create tap for: ${requiredSource}, with error: requirement failed: " + TestTapFactory.sourceNotFoundError.format(requiredSource)) } + "use local mode by default" in { + JobTest(new SimpleTestJob(_)).getTestMode(true, None) match { + case m: HadoopTest => m.jobConf.get("mapreduce.framework.name") shouldBe "local" + } + } } }