HBASE-2615 M/R on bulk imported tables

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@951756 13f79535-47bb-0310-9956-ffa450edef68

src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java

@@ -168,7 +168,7 @@ public class TestHFileOutputFormat  {
 
       // Test 2. Now test passing a kv that has explicit ts.  It should not be
       // changed by call to record write.
-      kv = new KeyValue(b, b, b, System.currentTimeMillis(), b);
+      kv = new KeyValue(b, b, b, kv.getTimestamp() - 1, b);
       original = kv.clone();
       writer.write(new ImmutableBytesWritable(), kv);
       assertTrue(original.equals(kv));