Repository: sqoop Updated Branches: refs/heads/sqoop2 d7a8175ae -> a389c2c7c
SQOOP-1697: Sqoop2: HDFS Connector TestLoader.verifyOutput have invalid default value for Hadoop 1 (Jarek Jarcec Cecho via Abraham Elmahrek) Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/a389c2c7 Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/a389c2c7 Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/a389c2c7 Branch: refs/heads/sqoop2 Commit: a389c2c7c7edbf2dd0244ee7260f53a06ce326c8 Parents: d7a8175 Author: Abraham Elmahrek <[email protected]> Authored: Sat Nov 8 23:16:52 2014 -0800 Committer: Abraham Elmahrek <[email protected]> Committed: Sat Nov 8 23:24:30 2014 -0800 ---------------------------------------------------------------------- .../test/java/org/apache/sqoop/connector/hdfs/TestLoader.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sqoop/blob/a389c2c7/connector/connector-hdfs/src/test/java/org/apache/sqoop/connector/hdfs/TestLoader.java ---------------------------------------------------------------------- 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 a30d410..b404c34 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 @@ public class TestLoader extends TestHdfsBase { 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:
