BIGTOP-2701. Update hcfs tests so it can work in both casers where fs.trash.interval is disabled or enabled.
Update TestCLI.java Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/0aeea971 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/0aeea971 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/0aeea971 Branch: refs/heads/master Commit: 0aeea9710d9dba1127f6fb0700ae632cd9957813 Parents: 42dc2de Author: Raj Desai <[email protected]> Authored: Tue Mar 14 11:34:50 2017 -0700 Committer: Roman Shaposhnik <[email protected]> Committed: Tue Mar 21 23:01:54 2017 -0700 ---------------------------------------------------------------------- .../groovy/org/apache/bigtop/itest/hadoop/hcfs/TestCLI.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/0aeea971/bigtop-tests/test-artifacts/hadoop/src/main/groovy/org/apache/bigtop/itest/hadoop/hcfs/TestCLI.java ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-artifacts/hadoop/src/main/groovy/org/apache/bigtop/itest/hadoop/hcfs/TestCLI.java b/bigtop-tests/test-artifacts/hadoop/src/main/groovy/org/apache/bigtop/itest/hadoop/hcfs/TestCLI.java index be673de..4221182 100644 --- a/bigtop-tests/test-artifacts/hadoop/src/main/groovy/org/apache/bigtop/itest/hadoop/hcfs/TestCLI.java +++ b/bigtop-tests/test-artifacts/hadoop/src/main/groovy/org/apache/bigtop/itest/hadoop/hcfs/TestCLI.java @@ -35,6 +35,8 @@ import org.junit.Test; import org.junit.Assert; import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * Tests for the Command Line Interface (CLI) @@ -48,6 +50,7 @@ public class TestCLI extends CLITestHelper { private String supergroup; private String namenode; private static Shell shHDFS = new Shell("/bin/bash"); + private static Log LOG = LogFactory.getLog(Shell.class); @Before @Override @@ -80,8 +83,9 @@ public class TestCLI extends CLITestHelper { 0, shHDFS.getRet()); // We can't just use conf.setInt(fs.trash.interval",0) because if trash is // enabled on the server, client configuration value is ignored. - Assert.assertEquals("HDFS trash should be disabled via fs.trash.interval", - 0, conf.getInt("fs.trash.interval", 0)); + /*Assert.assertEquals("HDFS trash should be disabled via fs.trash.interval", + 0, conf.getInt("fs.trash.interval", 0));*/ + LOG.info("HDFS fs.trash.interval is set to: "+conf.getInt("fs.trash.interval", 0)); Assert.assertEquals("This test needs to be run under root user of hcfs", System.getProperty("hcfs.root.username", "hdfs"), System.getProperty("user.name"));
