Author: wheat9
Date: Thu Mar 6 08:13:40 2014
New Revision: 1574792
URL: http://svn.apache.org/r1574792
Log:
HDFS-6058. Fix TestHDFSCLI failures after HADOOP-8691 change. Contributed by
Akira Ajisaka and Haohui Mai.
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/cli/testMRConf.xml
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/cli/testMRConf.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/cli/testMRConf.xml?rev=1574792&r1=1574791&r2=1574792&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/cli/testMRConf.xml
(original)
+++
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/cli/testMRConf.xml
Thu Mar 6 08:13:40 2014
@@ -313,10 +313,6 @@
</cleanup-commands>
<comparators>
<comparator>
- <type>TokenComparator</type>
- <expected-output>Found 1 items</expected-output>
- </comparator>
- <comparator>
<type>RegexpComparator</type>
<expected-output>^[drwx-]+( )*[0-9\-]+( )*[a-zA-Z0-9]+(
)*supergroup( )*0( )*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}(
)*/dir1/test.har</expected-output>
</comparator>
@@ -340,10 +336,6 @@
</cleanup-commands>
<comparators>
<comparator>
- <type>TokenComparator</type>
- <expected-output>Found 1 items</expected-output>
- </comparator>
- <comparator>
<type>RegexpComparator</type>
<expected-output>^[drwx-]+( )*[0-9\-]+( )*[a-zA-Z0-9]+(
)*supergroup( )*0( )*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}(
)*/dest/test.har</expected-output>
</comparator>
@@ -363,10 +355,6 @@
</cleanup-commands>
<comparators>
<comparator>
- <type>TokenComparator</type>
- <expected-output>Found 1 items</expected-output>
- </comparator>
- <comparator>
<type>RegexpComparator</type>
<expected-output>^[drwx-]+( )*[0-9\-]+( )*[a-zA-Z0-9]+(
)*supergroup( )*0( )*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}(
)*/dir1/test.har</expected-output>
</comparator>
@@ -386,10 +374,6 @@
</cleanup-commands>
<comparators>
<comparator>
- <type>TokenComparator</type>
- <expected-output>Found 1 items</expected-output>
- </comparator>
- <comparator>
<type>RegexpComparator</type>
<expected-output>^[drwx-]+( )*[0-9\-]+( )*[a-zA-Z0-9]+(
)*supergroup( )*0( )*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}(
)*/dest/test.har</expected-output>
</comparator>
@@ -468,10 +452,6 @@
</cleanup-commands>
<comparators>
<comparator>
- <type>TokenComparator</type>
- <expected-output>Found 1 items</expected-output>
- </comparator>
- <comparator>
<type>RegexpComparator</type>
<expected-output>^[drwx-]+( )*[0-9\-]+( )*[a-zA-Z0-9]+(
)*supergroup( )*0( )*[0-9]{4,}-[0-9]{2,}-[0-9]{2,} [0-9]{2,}:[0-9]{2,}(
)*/dest/test1.har</expected-output>
</comparator>
