Repository: bigtop Updated Branches: refs/heads/master 8cc9b8017 -> 84c2e093a
BIGTOP-1511: make TestCLI compatible with Hadoop 2.4 Removes all occurences of TokenComparator for string 'Found 1 items'. Based on HDFS-6058: Fix TestHDFSCLI failures after HADOOP-8691 change. Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/84c2e093 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/84c2e093 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/84c2e093 Branch: refs/heads/master Commit: 84c2e093a5a349053d2f3e910f3b4280eab6830f Parents: 8cc9b80 Author: Martin Bukatovic <[email protected]> Authored: Mon Nov 3 20:35:23 2014 +0100 Committer: [email protected] <jayunit100> Committed: Mon Nov 3 20:19:05 2014 -0500 ---------------------------------------------------------------------- .../resources/clitest_data/testHCFSConf.xml | 72 -------------------- 1 file changed, 72 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/84c2e093/bigtop-tests/test-artifacts/hadoop/src/main/resources/clitest_data/testHCFSConf.xml ---------------------------------------------------------------------- diff --git a/bigtop-tests/test-artifacts/hadoop/src/main/resources/clitest_data/testHCFSConf.xml b/bigtop-tests/test-artifacts/hadoop/src/main/resources/clitest_data/testHCFSConf.xml index 63b5f51..37e24e7 100644 --- a/bigtop-tests/test-artifacts/hadoop/src/main/resources/clitest_data/testHCFSConf.xml +++ b/bigtop-tests/test-artifacts/hadoop/src/main/resources/clitest_data/testHCFSConf.xml @@ -49,10 +49,6 @@ </cleanup-commands> <comparators> <comparator> - <type>TokenComparator</type> - <expected-output>Found 1 items</expected-output> - </comparator> - <comparator> <type>RegexpComparator</type> <expected-output>^-rw-r--r--( )*1( )*[a-z]*( )*supergroup( )*0( )*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}( )*TEST_DIR_ABSOLUTE/file1</expected-output> </comparator> @@ -71,10 +67,6 @@ </cleanup-commands> <comparators> <comparator> - <type>TokenComparator</type> - <expected-output>Found 1 items</expected-output> - </comparator> - <comparator> <type>RegexpComparator</type> <expected-output>^-rw-r--r--( )*1( )*[a-z]*( )*supergroup( )*0( )*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}( )*file1</expected-output> </comparator> @@ -125,10 +117,6 @@ </cleanup-commands> <comparators> <comparator> - <type>TokenComparator</type> - <expected-output>Found 1 items</expected-output> - </comparator> - <comparator> <type>RegexpComparator</type> <expected-output>^drwxr-xr-x( )*-( )*[a-z]*( )*supergroup( )*HCFS_DIRSIZE( )*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}( )*TEST_DIR_ABSOLUTE/dir1</expected-output> </comparator> @@ -146,10 +134,6 @@ </cleanup-commands> <comparators> <comparator> - <type>TokenComparator</type> - <expected-output>Found 1 items</expected-output> - </comparator> - <comparator> <type>RegexpComparator</type> <expected-output>^drwxr-xr-x( )*-( )*[a-z]*( )*supergroup( )*HCFS_DIRSIZE( )*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}( )*dir1</expected-output> </comparator> @@ -230,10 +214,6 @@ </cleanup-commands> <comparators> <comparator> - <type>TokenComparator</type> - <expected-output>Found 1 items</expected-output> - </comparator> - <comparator> <type>RegexpComparator</type> <expected-output>^-rw-r--r--( )*1( )*[a-z]*( )*supergroup( )*0( )*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}( )*NAMENODETEST_DIR_ABSOLUTE/file1</expected-output> </comparator> @@ -251,10 +231,6 @@ </cleanup-commands> <comparators> <comparator> - <type>TokenComparator</type> - <expected-output>Found 1 items</expected-output> - </comparator> - <comparator> <type>RegexpComparator</type> <expected-output>^-rw-r--r--( )*1( )*[a-z]*( )*supergroup( )*0( )*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}( )*HCFS_SCHEME//TEST_DIR_ABSOLUTE/file1</expected-output> </comparator> @@ -1585,10 +1561,6 @@ </cleanup-commands>: <comparators> <comparator> - <type>TokenComparator</type> - <expected-output>Found 1 items</expected-output> - </comparator> - <comparator> <type>RegexpComparator</type> <expected-output>^-rw-r--r--( )*1( )*[a-z]*( )*supergroup( )*0( )*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}( )*TEST_DIR_ABSOLUTE/file2</expected-output> </comparator> @@ -1746,10 +1718,6 @@ </cleanup-commands> <comparators> <comparator> - <type>TokenComparator</type> - <expected-output>Found 1 items</expected-output> - </comparator> - <comparator> <type>RegexpComparator</type> <expected-output>^-rw-r--r--( )*1( )*[a-z]*( )*supergroup( )*0( )*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}( )*file2</expected-output> </comparator> @@ -1772,10 +1740,6 @@ </cleanup-commands>: <comparators> <comparator> - <type>TokenComparator</type> - <expected-output>Found 1 items</expected-output> - </comparator> - <comparator> <type>RegexpComparator</type> <expected-output>^-rw-r--r--( )*1( )*[a-z]*( )*supergroup( )*0( )*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}( )*HCFS_SCHEME//TEST_DIR_ABSOLUTE/file2</expected-output> </comparator> @@ -1925,10 +1889,6 @@ </cleanup-commands>: <comparators> <comparator> - <type>TokenComparator</type> - <expected-output>Found 1 items</expected-output> - </comparator> - <comparator> <type>RegexpComparator</type> <expected-output>^-rw-r--r--( )*1( )*[a-z]*( )*supergroup( )*0( )*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}( )*NAMENODETEST_DIR_ABSOLUTE/file2</expected-output> </comparator> @@ -8183,10 +8143,6 @@ </cleanup-commands> <comparators> <comparator> - <type>TokenComparator</type> - <expected-output>Found 1 items</expected-output> - </comparator> - <comparator> <type>RegexpComparator</type> <expected-output>^-rwxrwxrwx( )*1( )*[a-z]*( )*supergroup( )*0( )*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}( )*TEST_DIR_ABSOLUTE/file1</expected-output> </comparator> @@ -8206,10 +8162,6 @@ </cleanup-commands> <comparators> <comparator> - <type>TokenComparator</type> - <expected-output>Found 1 items</expected-output> - </comparator> - <comparator> <type>RegexpComparator</type> <expected-output>^-rw-rw-rw-( )*1( )*[a-z]*( )*supergroup( )*0( )*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}( )*file1</expected-output> </comparator> @@ -8296,10 +8248,6 @@ </cleanup-commands> <comparators> <comparator> - <type>TokenComparator</type> - <expected-output>Found 1 items</expected-output> - </comparator> - <comparator> <type>RegexpComparator</type> <expected-output>^-rw-rw-rw-( )*1( )*[a-z]*( )*supergroup( )*0( )*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}( )*TEST_DIR_ABSOLUTE/file1</expected-output> </comparator> @@ -8318,10 +8266,6 @@ </cleanup-commands> <comparators> <comparator> - <type>TokenComparator</type> - <expected-output>Found 1 items</expected-output> - </comparator> - <comparator> <type>RegexpComparator</type> <expected-output>^-rw-rw-rw-( )*1( )*[a-z]*( )*supergroup( )*0( )*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}( )*file1</expected-output> </comparator> @@ -9820,10 +9764,6 @@ </cleanup-commands> <comparators> <comparator> - <type>TokenComparator</type> - <expected-output>Found 1 items</expected-output> - </comparator> - <comparator> <type>RegexpComparator</type> <expected-output>^-rwxrwxrwx( )*1( )*[a-z]*( )*supergroup( )*0( )*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}( )*HCFS_SCHEME//TEST_DIR_ABSOLUTE/file1</expected-output> </comparator> @@ -9876,10 +9816,6 @@ </cleanup-commands> <comparators> <comparator> - <type>TokenComparator</type> - <expected-output>Found 1 items</expected-output> - </comparator> - <comparator> <type>RegexpComparator</type> <expected-output>^-rw-rw-rw-( )*1( )*[a-z]*( )*supergroup( )*0( )*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}( )*HCFS_SCHEME//TEST_DIR_ABSOLUTE/file1</expected-output> </comparator> @@ -10639,10 +10575,6 @@ </cleanup-commands> <comparators> <comparator> - <type>TokenComparator</type> - <expected-output>Found 1 items</expected-output> - </comparator> - <comparator> <type>RegexpComparator</type> <expected-output>^-rwxrwxrwx( )*1( )*[a-z]*( )*supergroup( )*0( )*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}( )*NAMENODETEST_DIR_ABSOLUTE/file1</expected-output> </comparator> @@ -10695,10 +10627,6 @@ </cleanup-commands> <comparators> <comparator> - <type>TokenComparator</type> - <expected-output>Found 1 items</expected-output> - </comparator> - <comparator> <type>RegexpComparator</type> <expected-output>^-rw-rw-rw-( )*1( )*[a-z]*( )*supergroup( )*0( )*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}( )*NAMENODETEST_DIR_ABSOLUTE/file1</expected-output> </comparator>
