Author: tomwhite
Date: Mon Aug 16 17:54:53 2010
New Revision: 986075
URL: http://svn.apache.org/viewvc?rev=986075&view=rev
Log:
Fix incorrect merge in r985617.
Modified:
hadoop/mapreduce/branches/branch-0.21/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorEndToEnd.java
Modified:
hadoop/mapreduce/branches/branch-0.21/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorEndToEnd.java
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorEndToEnd.java?rev=986075&r1=986074&r2=986075&view=diff
==============================================================================
---
hadoop/mapreduce/branches/branch-0.21/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorEndToEnd.java
(original)
+++
hadoop/mapreduce/branches/branch-0.21/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorEndToEnd.java
Mon Aug 16 17:54:53 2010
@@ -43,6 +43,7 @@ public class TestSimulatorEndToEnd {
public void testMain() throws Exception {
final Configuration conf = new Configuration();
conf.set(SimulatorJobSubmissionPolicy.JOB_SUBMISSION_POLICY,
policy.name());
+ conf.setBoolean(JTConfig.JT_PERSIST_JOBSTATUS, false);
final FileSystem lfs = FileSystem.getLocal(conf);
final Path rootInputDir = new Path(
System.getProperty("src.test.data", "data")).makeQualified(lfs);
@@ -57,7 +58,6 @@ public class TestSimulatorEndToEnd {
MockSimulatorEngine mockMumak = new MockSimulatorEngine(numJobs,
nTrackers);
- mumakConf.setBoolean(JTConfig.JT_PERSIST_JOBSTATUS, false);
String[] args = { traceFile.toString(), topologyFile.toString() };
int res = ToolRunner.run(conf, mockMumak, args);
Assert.assertEquals(res, 0);