You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by wh...@apache.org on 2014/03/06 09:20:11 UTC
svn commit: r1574795 -
/hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/cli/testMRConf.xml
Author: wheat9
Date: Thu Mar 6 08:20:10 2014
New Revision: 1574795
URL: http://svn.apache.org/r1574795
Log:
Merge r1574794 from branch-2.
Modified:
hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/cli/testMRConf.xml
Modified: hadoop/common/branches/branch-2.4/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/branches/branch-2.4/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/cli/testMRConf.xml?rev=1574795&r1=1574794&r2=1574795&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/cli/testMRConf.xml (original)
+++ hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/cli/testMRConf.xml Thu Mar 6 08:20:10 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>