From 3625edc73e683d52c73d076b9d9262b6389fcb80 Mon Sep 17 00:00:00 2001 From: Nick Dimiduk Date: Wed, 13 Mar 2013 15:05:54 -0700 Subject: [PATCH] HBASE-8094 fix broken TestTableInputFormatScan Test asserts job completion, not job success. Fixed. --- .../hadoop/hbase/mapreduce/TestTableInputFormatScan.java | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatScan.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatScan.java index bab9633..183de9a 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatScan.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatScan.java @@ -18,7 +18,9 @@ */ package org.apache.hadoop.hbase.mapreduce; -import java.io.File; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import java.io.IOException; import java.util.Map; import java.util.NavigableMap; @@ -26,7 +28,6 @@ import java.util.NavigableMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.fs.FileUtil; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.LargeTests; @@ -39,16 +40,11 @@ import org.apache.hadoop.io.NullWritable; import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.mapreduce.Reducer; import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat; -import org.junit.After; import org.junit.AfterClass; -import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - /** * Tests various scan start and stop row scenarios. This is set in a scan and * tested in a MapReduce job to see if that is handed over and done properly @@ -346,8 +342,7 @@ public class TestTableInputFormatScan { job.setInputFormatClass(TableInputFormat.class); job.setNumReduceTasks(1); FileOutputFormat.setOutputPath(job, new Path(job.getJobName())); - job.waitForCompletion(true); - assertTrue(job.isComplete()); + assertTrue(job.waitForCompletion(true)); } /** @@ -382,8 +377,7 @@ public class TestTableInputFormatScan { job.setNumReduceTasks(1); // one to get final "first" and "last" key FileOutputFormat.setOutputPath(job, new Path(job.getJobName())); LOG.info("Started " + job.getJobName()); - job.waitForCompletion(true); - assertTrue(job.isComplete()); + assertTrue(job.waitForCompletion(true)); LOG.info("After map/reduce completion - job " + jobName); } -- 1.8.1