Repository: bigtop Updated Branches: refs/heads/master e5c16ef25 -> 37b0bf1ec
BIGTOP-1617. Make clean-up commands in TestCLI more specific Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/37b0bf1e Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/37b0bf1e Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/37b0bf1e Branch: refs/heads/master Commit: 37b0bf1ec151d9716936ba52583d8bb4b1360c49 Parents: e5c16ef Author: Dasha <[email protected]> Authored: Wed Jan 28 18:12:09 2015 -0800 Committer: Dasha <[email protected]> Committed: Wed Jan 28 18:12:09 2015 -0800 ---------------------------------------------------------------------- .../src/main/resources/clitest_data/testDFSConf.xml | 14 +++++++------- .../src/main/resources/clitest_data/testHDFSConf.xml | 7 ++++--- 2 files changed, 11 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/37b0bf1e/bigtop-tests/test-artifacts/hadoop/src/main/resources/clitest_data/testDFSConf.xml ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-artifacts/hadoop/src/main/resources/clitest_data/testDFSConf.xml b/bigtop-tests/test-artifacts/hadoop/src/main/resources/clitest_data/testDFSConf.xml index 2f601f8..05a8709 100644 --- a/bigtop-tests/test-artifacts/hadoop/src/main/resources/clitest_data/testDFSConf.xml +++ b/bigtop-tests/test-artifacts/hadoop/src/main/resources/clitest_data/testDFSConf.xml @@ -33,7 +33,7 @@ </test-commands> <cleanup-commands> <dfs-admin-command>-fs NAMENODE -disallowSnapshot /user/USERNAME/dir1</dfs-admin-command> - <command>-fs NAMENODE -rm -r /user/USERNAME</command> + <command>-fs NAMENODE -rm -r /user/USERNAME/dir1</command> </cleanup-commands> <comparators> <comparator> @@ -51,7 +51,7 @@ <dfs-admin-command>-fs NAMENODE -disallowSnapshot /user/USERNAME/dir1</dfs-admin-command> </test-commands> <cleanup-commands> - <command>-fs NAMENODE -rm -r /user/USERNAME</command> + <command>-fs NAMENODE -rm -r /user/USERNAME/dir1</command> </cleanup-commands> <comparators> <comparator> @@ -71,7 +71,7 @@ <cleanup-commands> <command>-fs NAMENODE -deleteSnapshot /user/USERNAME/dir1 snapshot1</command> <dfs-admin-command>-fs NAMENODE -disallowSnapshot /user/USERNAME/dir1</dfs-admin-command> - <command>-fs NAMENODE -rm -r /user/USERNAME</command> + <command>-fs NAMENODE -rm -r /user/USERNAME/dir1</command> </cleanup-commands> <comparators> <comparator> @@ -93,7 +93,7 @@ <cleanup-commands> <command>-fs NAMENODE -deleteSnapshot /user/USERNAME/dir1 snapshot2</command> <dfs-admin-command>-fs NAMENODE -disallowSnapshot /user/USERNAME/dir1</dfs-admin-command> - <command>-fs NAMENODE -rm -r /user/USERNAME</command> + <command>-fs NAMENODE -rm -r /user/USERNAME/dir1</command> </cleanup-commands> <comparators> <comparator> @@ -118,7 +118,7 @@ </test-commands> <cleanup-commands> <dfs-admin-command>-fs NAMENODE -disallowSnapshot /user/USERNAME/dir1</dfs-admin-command> - <command>-fs NAMENODE -rm -r /user/USERNAME</command> + <command>-fs NAMENODE -rm -r /user/USERNAME/dir1</command> </cleanup-commands> <comparators> <comparator> @@ -169,7 +169,7 @@ <command>-fs NAMENODE -count -q /user/USERNAME/dir1</command> </test-commands> <cleanup-commands> - <command>-fs NAMENODE -rm -r /user/USERNAME</command> + <command>-fs NAMENODE -rm -r /user/USERNAME/dir1</command> </cleanup-commands> <comparators> <comparator> @@ -188,7 +188,7 @@ <command>-fs NAMENODE -count -q /user/USERNAME/dir1</command> </test-commands> <cleanup-commands> - <command>-fs NAMENODE -rm -r /user/USERNAME</command> + <command>-fs NAMENODE -rm -r /user/USERNAME/dir1</command> </cleanup-commands> <comparators> <comparator> http://git-wip-us.apache.org/repos/asf/bigtop/blob/37b0bf1e/bigtop-tests/test-artifacts/hadoop/src/main/resources/clitest_data/testHDFSConf.xml ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-artifacts/hadoop/src/main/resources/clitest_data/testHDFSConf.xml b/bigtop-tests/test-artifacts/hadoop/src/main/resources/clitest_data/testHDFSConf.xml index a1257a8..b4358c5 100644 --- a/bigtop-tests/test-artifacts/hadoop/src/main/resources/clitest_data/testHDFSConf.xml +++ b/bigtop-tests/test-artifacts/hadoop/src/main/resources/clitest_data/testHDFSConf.xml @@ -49,7 +49,7 @@ <command>-fs NAMENODE -checksum dir0/data*</command> </test-commands> <cleanup-commands> - <command>-fs NAMENODE -rm -r /user/USER_NAME/*</command> + <command>-fs NAMENODE -rm -r /user/USER_NAME/dir0</command> </cleanup-commands> <comparators> <comparator> @@ -95,7 +95,7 @@ <command>-fs NAMENODE -stat "%n-%b-%o" dirtest</command> </test-commands> <cleanup-commands> - <command>-fs NAMENODE -rm -r /user/USER_NAME/*</command> + <command>-fs NAMENODE -rm -r /user/USER_NAME/dirtest</command> </cleanup-commands> <comparators> <comparator> @@ -156,7 +156,8 @@ <command>-fs NAMENODE -stat "%n-%b" data*</command> </test-commands> <cleanup-commands> - <command>-fs NAMENODE -rm -r /user/USER_NAME/*</command> + <command>-fs NAMENODE -rm -r /user/USER_NAME/dir</command> + <command>-fs NAMENODE -rm -r /user/USER_NAME/dirtest</command> </cleanup-commands> <comparators> <comparator>
