From a389c2c7c7edbf2dd0244ee7260f53a06ce326c8 Mon Sep 17 00:00:00 2001 From: Abraham Elmahrek Date: Sat, 8 Nov 2014 23:16:52 -0800 Subject: [PATCH] SQOOP-1697: Sqoop2: HDFS Connector TestLoader.verifyOutput have invalid default value for Hadoop 1 (Jarek Jarcec Cecho via Abraham Elmahrek) --- .../java/org/apache/sqoop/connector/hdfs/TestLoader.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/connector/connector-hdfs/src/test/java/org/apache/sqoop/connector/hdfs/TestLoader.java b/connector/connector-hdfs/src/test/java/org/apache/sqoop/connector/hdfs/TestLoader.java index a30d410b..b404c34f 100644 --- a/connector/connector-hdfs/src/test/java/org/apache/sqoop/connector/hdfs/TestLoader.java +++ b/connector/connector-hdfs/src/test/java/org/apache/sqoop/connector/hdfs/TestLoader.java @@ -159,7 +159,11 @@ private void verifyOutput(FileSystem fs, Path file) throws IOException { break; case DEFAULT: - Assert.assertTrue(codec.getClass().getCanonicalName().indexOf("Deflate") != -1); + if(org.apache.hadoop.util.VersionInfo.getVersion().matches("\\b1\\.\\d\\.\\d")) { + Assert.assertTrue(codec.getClass().getCanonicalName().indexOf("Default") != -1); + } else { + Assert.assertTrue(codec.getClass().getCanonicalName().indexOf("Deflate") != -1); + } break; case NONE: