You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by su...@apache.org on 2011/03/08 00:03:18 UTC

svn commit: r1079012 [2/3] - in /hadoop/hdfs/branches/HDFS-1052: ./ ivy/ src/ant/org/apache/hadoop/ant/ src/c++/libhdfs/ src/contrib/fuse-dfs/ src/contrib/hdfsproxy/ src/contrib/thriftfs/ src/contrib/thriftfs/if/ src/contrib/thriftfs/scripts/ src/contr...

Modified: hadoop/hdfs/branches/HDFS-1052/src/test/hdfs/org/apache/hadoop/cli/testHDFSConf.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-1052/src/test/hdfs/org/apache/hadoop/cli/testHDFSConf.xml?rev=1079012&r1=1079011&r2=1079012&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-1052/src/test/hdfs/org/apache/hadoop/cli/testHDFSConf.xml (original)
+++ hadoop/hdfs/branches/HDFS-1052/src/test/hdfs/org/apache/hadoop/cli/testHDFSConf.xml Mon Mar  7 23:03:17 2011
@@ -1,6 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="testConf.xsl"?>
 
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+
 <configuration>
   <!-- Normal mode is test. To run just the commands and dump the output
        to the log, set it to nocompare -->
@@ -419,7 +436,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^ls: Cannot access hdfs://localhost[.a-z]*:[0-9]+/file1: No such file or directory.</expected-output>
+          <expected-output>^ls: Cannot access hdfs://\w+[.a-z]*:[0-9]+/file1: No such file or directory.</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -870,7 +887,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^lsr: Cannot access hdfs://localhost[.a-z]*:[0-9]+/file1: No such file or directory.</expected-output>
+          <expected-output>^lsr: Cannot access hdfs://\w+[.a-z]*:[0-9]+/file1: No such file or directory.</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -911,7 +928,7 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://localhost[.a-z]*:[0-9]*/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/data15bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -932,7 +949,7 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/data15bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -956,19 +973,19 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/data15bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^30( |\t)*hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/data30bytes</expected-output>
+          <expected-output>^30( |\t)*hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/data30bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^60( |\t)*hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/data60bytes</expected-output>
+          <expected-output>^60( |\t)*hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/data60bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^120( |\t)*hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/data120bytes</expected-output>
+          <expected-output>^120( |\t)*hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/data120bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -990,7 +1007,7 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir0/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/data15bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1012,7 +1029,7 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/dir0/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir0/data15bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1037,19 +1054,19 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir0/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/data15bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^30( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir0/data30bytes</expected-output>
+          <expected-output>^30( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/data30bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^60( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir0/data60bytes</expected-output>
+          <expected-output>^60( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/data60bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^120( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir0/data120bytes</expected-output>
+          <expected-output>^120( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/data120bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1070,7 +1087,7 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://localhost[.a-z]*:[0-9]*/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/data15bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1094,19 +1111,19 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://localhost[.a-z]*:[0-9]*/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/data15bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^30( |\t)*hdfs://localhost[.a-z]*:[0-9]*/data30bytes</expected-output>
+          <expected-output>^30( |\t)*hdfs://\w+[.a-z]*:[0-9]*/data30bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^60( |\t)*hdfs://localhost[.a-z]*:[0-9]*/data60bytes</expected-output>
+          <expected-output>^60( |\t)*hdfs://\w+[.a-z]*:[0-9]*/data60bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^120( |\t)*hdfs://localhost[.a-z]*:[0-9]*/data120bytes</expected-output>
+          <expected-output>^120( |\t)*hdfs://\w+[.a-z]*:[0-9]*/data120bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1128,7 +1145,7 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir0/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/data15bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1151,11 +1168,11 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir0/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/data15bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^1.0k( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir0/data1k</expected-output>
+          <expected-output>^1.0k( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/data1k</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1180,19 +1197,19 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir0/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/data15bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^30( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir0/data30bytes</expected-output>
+          <expected-output>^30( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/data30bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^60( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir0/data60bytes</expected-output>
+          <expected-output>^60( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/data60bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^120( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir0/data120bytes</expected-output>
+          <expected-output>^120( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/data120bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1213,7 +1230,7 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://localhost[.a-z]*:[0-9]*/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/data15bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1237,19 +1254,19 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://localhost[.a-z]*:[0-9]*/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/data15bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^30( |\t)*hdfs://localhost[.a-z]*:[0-9]*/data30bytes</expected-output>
+          <expected-output>^30( |\t)*hdfs://\w+[.a-z]*:[0-9]*/data30bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^60( |\t)*hdfs://localhost[.a-z]*:[0-9]*/data60bytes</expected-output>
+          <expected-output>^60( |\t)*hdfs://\w+[.a-z]*:[0-9]*/data60bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^120( |\t)*hdfs://localhost[.a-z]*:[0-9]*/data120bytes</expected-output>
+          <expected-output>^120( |\t)*hdfs://\w+[.a-z]*:[0-9]*/data120bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1271,7 +1288,7 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir0/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/data15bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1296,19 +1313,19 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir0/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/data15bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^30( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir0/data30bytes</expected-output>
+          <expected-output>^30( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/data30bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^60( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir0/data60bytes</expected-output>
+          <expected-output>^60( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/data60bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^120( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir0/data120bytes</expected-output>
+          <expected-output>^120( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/data120bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1341,7 +1358,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^450\s+hdfs://localhost[.a-z]*:[0-9]*/dir0</expected-output>
+          <expected-output>^450\s+hdfs://\w+[.a-z]*:[0-9]*/dir0</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1373,7 +1390,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^450\s+hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/dir0</expected-output>
+          <expected-output>^450\s+hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir0</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1411,7 +1428,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^450\s+hdfs://localhost[.a-z]*:[0-9]*/dir0</expected-output>
+          <expected-output>^450\s+hdfs://\w+[.a-z]*:[0-9]*/dir0</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1444,7 +1461,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^450\s+hdfs://localhost[.a-z]*:[0-9]*/dir0</expected-output>
+          <expected-output>^450\s+hdfs://\w+[.a-z]*:[0-9]*/dir0</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1482,7 +1499,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^450\s+hdfs://localhost[.a-z]*:[0-9]*/dir0</expected-output>
+          <expected-output>^450\s+hdfs://\w+[.a-z]*:[0-9]*/dir0</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1514,7 +1531,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^450\s+hdfs://localhost[.a-z]*:[0-9]*/dir0</expected-output>
+          <expected-output>^450\s+hdfs://\w+[.a-z]*:[0-9]*/dir0</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1552,7 +1569,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^450\s+hdfs://localhost[.a-z]*:[0-9]*/dir0</expected-output>
+          <expected-output>^450\s+hdfs://\w+[.a-z]*:[0-9]*/dir0</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1596,7 +1613,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^mv: Failed to rename hdfs://localhost[.a-z]*:[0-9]*/file1 to file2</expected-output>
+          <expected-output>^mv: Failed to rename hdfs://\w+[.a-z]*:[0-9]*/file1 to file2</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1952,7 +1969,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^ls: Cannot access hdfs:\/\/localhost[.a-z]*:[0-9]+\/file1: No such file or directory.</expected-output>
+          <expected-output>^ls: Cannot access hdfs:\/\/\w+[.a-z]*:[0-9]+\/file1: No such file or directory.</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1967,7 +1984,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^mv: hdfs://localhost[.a-z]*:[0-9]+/file1: No such file or directory</expected-output>
+          <expected-output>^mv: hdfs://\w+[.a-z]*:[0-9]+/file1: No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -2001,7 +2018,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^ls: Cannot access hdfs:\/\/localhost[.a-z]*:[0-9]+\/file1: No such file or directory.</expected-output>
+          <expected-output>^ls: Cannot access hdfs:\/\/\w+[.a-z]*:[0-9]+\/file1: No such file or directory.</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -2045,7 +2062,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^ls: Cannot access hdfs:\/\/localhost[.a-z]*:[0-9]+\/file\*: No such file or directory.</expected-output>
+          <expected-output>^ls: Cannot access hdfs:\/\/\w+[.a-z]*:[0-9]+\/file\*: No such file or directory.</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -2961,7 +2978,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^cp: File does not exist: hdfs://localhost[.a-z]*:[0-9]+/file</expected-output>
+          <expected-output>^cp: File does not exist: hdfs://\w+[.a-z]*:[0-9]+/file</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3003,7 +3020,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^cp: When copying multiple files, destination hdfs://localhost[.a-z]*:[0-9]+/file5 should be a directory.</expected-output>
+          <expected-output>^cp: When copying multiple files, destination hdfs://\w+[.a-z]*:[0-9]+/file5 should be a directory.</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3043,7 +3060,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^cp: When copying multiple files, destination hdfs://localhost[.a-z]*:[0-9]+/dir should be a directory.</expected-output>
+          <expected-output>^cp: When copying multiple files, destination hdfs://\w+[.a-z]*:[0-9]+/dir should be a directory.</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3147,7 +3164,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/dir0/file0</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir0/file0</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3164,7 +3181,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/file0</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/file0</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3184,19 +3201,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/dir0/file0</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir0/file0</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/dir0/file1</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir0/file1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/dir0/file2</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir0/file2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/dir0/file3</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir0/file3</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3216,19 +3233,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/file0</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/file0</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/file1</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/file1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/file2</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/file2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/file3</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/file3</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3245,7 +3262,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^rm: Cannot remove directory "hdfs://localhost[.a-z]*:[0-9]*/dir0", use -rmr instead</expected-output>
+          <expected-output>^rm: Cannot remove directory "hdfs://\w+[.a-z]*:[0-9]*/dir0", use -rmr instead</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3311,7 +3328,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/file0</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/file0</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3331,19 +3348,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/file0</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/file0</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/file1</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/file1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/file2</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/file2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/file3</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/file3</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3360,7 +3377,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^rm: Cannot remove directory "hdfs://localhost[.a-z]*:[0-9]*/dir0", use -rmr instead</expected-output>
+          <expected-output>^rm: Cannot remove directory "hdfs://\w+[.a-z]*:[0-9]*/dir0", use -rmr instead</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3397,19 +3414,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/file0</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/file0</expected-output>
        </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/file1</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/file1</expected-output>
        </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/file2</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/file2</expected-output>
        </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/file3</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/file3</expected-output>
        </comparator>
       </comparators>
     </test>
@@ -3426,7 +3443,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/file0</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/file0</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3446,19 +3463,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/file0</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/file0</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/file1</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/file1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/file2</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/file2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/file3</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/file3</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3475,7 +3492,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>rm: cannot remove hdfs://localhost[.a-z]*:[0-9]*/dir0: No such file or directory.</expected-output>
+          <expected-output>rm: cannot remove hdfs://\w+[.a-z]*:[0-9]*/dir0: No such file or directory.</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3492,7 +3509,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^rm: cannot remove hdfs://localhost[.a-z]*:[0-9]*/file0: No such file or directory.</expected-output>
+          <expected-output>^rm: cannot remove hdfs://\w+[.a-z]*:[0-9]*/file0: No such file or directory.</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3512,19 +3529,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/file0</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/file0</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/file1</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/file1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/file2</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/file2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/file3</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/file3</expected-output>
        </comparator>
       </comparators>
     </test>
@@ -3542,7 +3559,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/dir0/file0</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir0/file0</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3559,7 +3576,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/file0</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/file0</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3576,7 +3593,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/dir0</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir0</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3593,7 +3610,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/dir0</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir0</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3613,19 +3630,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/dir0</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir0</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/dir1</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/dir2</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/dir3</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir3</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3645,19 +3662,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/dir0</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir0</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/dir1</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/dir2</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/dir3</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir3</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3706,7 +3723,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/file0</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/file0</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3723,7 +3740,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/dir0</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir0</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3743,19 +3760,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/dir0</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir0</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/dir1</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/dir2</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/dir3</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir3</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3791,19 +3808,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/dir0</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir0</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/dir1</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/dir2</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/dir3</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir3</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3820,7 +3837,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/file0</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/file0</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3837,7 +3854,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/dir0</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir0</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3857,19 +3874,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/dir0</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir0</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/dir1</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/dir2</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/dir3</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir3</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3885,7 +3902,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^rmr: cannot remove hdfs://localhost[.a-z]*:[0-9]*/file0: No such file or directory.</expected-output>
+          <expected-output>^rmr: cannot remove hdfs://\w+[.a-z]*:[0-9]*/file0: No such file or directory.</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3905,19 +3922,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/dir0</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir0</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/dir1</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/dir2</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://localhost[.a-z]*:[0-9]*/dir3</expected-output>
+          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir3</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3942,7 +3959,7 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://localhost[.a-z]*:[0-9]*/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/data15bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3963,7 +3980,7 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/data15bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3980,19 +3997,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir0/dir1/data/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/dir1/data/data15bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^30( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir0/dir1/data/data30bytes</expected-output>
+          <expected-output>^30( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/dir1/data/data30bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^60( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir0/dir1/data/data60bytes</expected-output>
+          <expected-output>^60( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/dir1/data/data60bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^120( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir0/dir1/data/data120bytes</expected-output>
+          <expected-output>^120( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/dir1/data/data120bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4009,19 +4026,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/dir0/dir1/data/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir0/dir1/data/data15bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^30( |\t)*hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/dir0/dir1/data/data30bytes</expected-output>
+          <expected-output>^30( |\t)*hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir0/dir1/data/data30bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^60( |\t)*hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/dir0/dir1/data/data60bytes</expected-output>
+          <expected-output>^60( |\t)*hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir0/dir1/data/data60bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^120( |\t)*hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/dir0/dir1/data/data120bytes</expected-output>
+          <expected-output>^120( |\t)*hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir0/dir1/data/data120bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4043,11 +4060,11 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir0/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/data15bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^30( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir0/data30bytes</expected-output>
+          <expected-output>^30( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/data30bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4069,11 +4086,11 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/dir0/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir0/data15bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^30( |\t)*hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/dir0/data30bytes</expected-output>
+          <expected-output>^30( |\t)*hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir0/data30bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4197,7 +4214,7 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://localhost[.a-z]*:[0-9]*/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/data15bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4214,19 +4231,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir1/data/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir1/data/data15bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^30( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir1/data/data30bytes</expected-output>
+          <expected-output>^30( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir1/data/data30bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^60( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir1/data/data60bytes</expected-output>
+          <expected-output>^60( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir1/data/data60bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^120( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir1/data/data120bytes</expected-output>
+          <expected-output>^120( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir1/data/data120bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4248,11 +4265,11 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir0/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/data15bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^30( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir0/data30bytes</expected-output>
+          <expected-output>^30( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/data30bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4339,7 +4356,7 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://localhost[.a-z]*:[0-9]*/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/data15bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4356,19 +4373,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir1/data/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir1/data/data15bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^30( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir1/data/data30bytes</expected-output>
+          <expected-output>^30( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir1/data/data30bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^60( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir1/data/data60bytes</expected-output>
+          <expected-output>^60( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir1/data/data60bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^120( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir1/data/data120bytes</expected-output>
+          <expected-output>^120( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir1/data/data120bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4390,11 +4407,11 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir0/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/data15bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^30( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir0/data30bytes</expected-output>
+          <expected-output>^30( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/data30bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4427,7 +4444,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^put: Target hdfs://localhost[.a-z]*:[0-9]+/user/file0 already exists</expected-output>
+          <expected-output>^put: Target hdfs://\w+[.a-z]*:[0-9]+/user/file0 already exists</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4444,7 +4461,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^put: copying multiple files, but last argument `hdfs://localhost[.a-z]*:[0-9]+/file0' is not a directory</expected-output>
+          <expected-output>^put: copying multiple files, but last argument `hdfs://\w+[.a-z]*:[0-9]+/file0' is not a directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4460,7 +4477,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^put: `hdfs://localhost[.a-z]*:[0-9]+/wrongdir': specified destination directory doest not exist</expected-output>
+          <expected-output>^put: `hdfs://\w+[.a-z]*:[0-9]+/wrongdir': specified destination directory doest not exist</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4482,7 +4499,7 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://localhost[.a-z]*:[0-9]*/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/data15bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4503,7 +4520,7 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/data15bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4520,19 +4537,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir0/dir1/data/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/dir1/data/data15bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^30( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir0/dir1/data/data30bytes</expected-output>
+          <expected-output>^30( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/dir1/data/data30bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^60( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir0/dir1/data/data60bytes</expected-output>
+          <expected-output>^60( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/dir1/data/data60bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^120( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir0/dir1/data/data120bytes</expected-output>
+          <expected-output>^120( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/dir1/data/data120bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4549,19 +4566,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/dir0/dir1/data/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir0/dir1/data/data15bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^30( |\t)*hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/dir0/dir1/data/data30bytes</expected-output>
+          <expected-output>^30( |\t)*hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir0/dir1/data/data30bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^60( |\t)*hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/dir0/dir1/data/data60bytes</expected-output>
+          <expected-output>^60( |\t)*hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir0/dir1/data/data60bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^120( |\t)*hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/dir0/dir1/data/data120bytes</expected-output>
+          <expected-output>^120( |\t)*hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir0/dir1/data/data120bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4583,11 +4600,11 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir0/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/data15bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^30( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir0/data30bytes</expected-output>
+          <expected-output>^30( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/data30bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4609,11 +4626,11 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/dir0/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir0/data15bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^30( |\t)*hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/dir0/data30bytes</expected-output>
+          <expected-output>^30( |\t)*hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir0/data30bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4737,7 +4754,7 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://localhost[.a-z]*:[0-9]*/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/data15bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4761,7 +4778,7 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir0/dir1/data/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/dir1/data/data15bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4783,11 +4800,11 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir0/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/data15bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^30( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir0/data30bytes</expected-output>
+          <expected-output>^30( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/data30bytes</expected-output>
         </comparator>
      </comparators>
     </test>
@@ -4875,7 +4892,7 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://localhost[.a-z]*:[0-9]*/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/data15bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4899,7 +4916,7 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir0/dir1/data/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/dir1/data/data15bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4921,11 +4938,11 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir0/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/data15bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^30( |\t)*hdfs://localhost[.a-z]*:[0-9]*/dir0/data30bytes</expected-output>
+          <expected-output>^30( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/data30bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4958,7 +4975,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>copyFromLocal: Target hdfs://localhost[.a-z]*:[0-9]+/user/file0 already exists</expected-output>
+          <expected-output>copyFromLocal: Target hdfs://\w+[.a-z]*:[0-9]+/user/file0 already exists</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4975,7 +4992,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^copyFromLocal: copying multiple files, but last argument `hdfs://localhost[.a-z]*:[0-9]+/file0' is not a directory</expected-output>
+          <expected-output>^copyFromLocal: copying multiple files, but last argument `hdfs://\w+[.a-z]*:[0-9]+/file0' is not a directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4991,7 +5008,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^copyFromLocal: `hdfs://localhost[.a-z]*:[0-9]+/wrongdir': specified destination directory doest not exist</expected-output>
+          <expected-output>^copyFromLocal: `hdfs://\w+[.a-z]*:[0-9]+/wrongdir': specified destination directory doest not exist</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5512,7 +5529,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0\s+hdfs://localhost[.a-z]*:[0-9]*/dir0</expected-output>
+          <expected-output>^0\s+hdfs://\w+[.a-z]*:[0-9]*/dir0</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5529,7 +5546,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0\s+hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/dir0</expected-output>
+          <expected-output>^0\s+hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir0</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5549,19 +5566,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0\s+hdfs://localhost[.a-z]*:[0-9]*/dir0</expected-output>
+          <expected-output>^0\s+hdfs://\w+[.a-z]*:[0-9]*/dir0</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0\s+hdfs://localhost[.a-z]*:[0-9]*/dir1</expected-output>
+          <expected-output>^0\s+hdfs://\w+[.a-z]*:[0-9]*/dir1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0\s+hdfs://localhost[.a-z]*:[0-9]*/dir2</expected-output>
+          <expected-output>^0\s+hdfs://\w+[.a-z]*:[0-9]*/dir2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0\s+hdfs://localhost[.a-z]*:[0-9]*/dir3</expected-output>
+          <expected-output>^0\s+hdfs://\w+[.a-z]*:[0-9]*/dir3</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5581,19 +5598,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0\s+hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/dir0</expected-output>
+          <expected-output>^0\s+hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir0</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0\s+hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/dir1</expected-output>
+          <expected-output>^0\s+hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0\s+hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/dir2</expected-output>
+          <expected-output>^0\s+hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0\s+hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/dir3</expected-output>
+          <expected-output>^0\s+hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir3</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5644,7 +5661,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0\s+hdfs://localhost[.a-z]*:[0-9]*/dir0(|\t)*</expected-output>
+          <expected-output>^0\s+hdfs://\w+[.a-z]*:[0-9]*/dir0(|\t)*</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5661,19 +5678,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0\s+hdfs://localhost[.a-z]*:[0-9]*/dir0</expected-output>
+          <expected-output>^0\s+hdfs://\w+[.a-z]*:[0-9]*/dir0</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0\s+hdfs://localhost[.a-z]*:[0-9]*/dir1</expected-output>
+          <expected-output>^0\s+hdfs://\w+[.a-z]*:[0-9]*/dir1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0\s+hdfs://localhost[.a-z]*:[0-9]*/dir2</expected-output>
+          <expected-output>^0\s+hdfs://\w+[.a-z]*:[0-9]*/dir2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0\s+hdfs://localhost[.a-z]*:[0-9]*/dir3</expected-output>
+          <expected-output>^0\s+hdfs://\w+[.a-z]*:[0-9]*/dir3</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5724,7 +5741,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0\s+hdfs://localhost[.a-z]*:[0-9]*/dir0</expected-output>
+          <expected-output>^0\s+hdfs://\w+[.a-z]*:[0-9]*/dir0</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5741,19 +5758,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0\s+hdfs://localhost[.a-z]*:[0-9]*/dir0</expected-output>
+          <expected-output>^0\s+hdfs://\w+[.a-z]*:[0-9]*/dir0</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0\s+hdfs://localhost[.a-z]*:[0-9]*/dir1</expected-output>
+          <expected-output>^0\s+hdfs://\w+[.a-z]*:[0-9]*/dir1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0\s+hdfs://localhost[.a-z]*:[0-9]*/dir2</expected-output>
+          <expected-output>^0\s+hdfs://\w+[.a-z]*:[0-9]*/dir2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0\s+hdfs://localhost[.a-z]*:[0-9]*/dir3</expected-output>
+          <expected-output>^0\s+hdfs://\w+[.a-z]*:[0-9]*/dir3</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5770,7 +5787,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>mkdir: cannot create directory hdfs://localhost[.a-z]*:[0-9]+/dir0: File exists</expected-output>
+          <expected-output>mkdir: cannot create directory hdfs://\w+[.a-z]*:[0-9]+/dir0: File exists</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5787,7 +5804,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>mkdir: hdfs://localhost[.a-z]*:[0-9]+/data15bytes exists but is not a directory</expected-output>
+          <expected-output>mkdir: hdfs://\w+[.a-z]*:[0-9]+/data15bytes exists but is not a directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5805,7 +5822,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Replication 2 set: hdfs://localhost[.a-z]*:[0-9]*/dir0/file0</expected-output>
+          <expected-output>^Replication 2 set: hdfs://\w+[.a-z]*:[0-9]*/dir0/file0</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5822,7 +5839,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Replication 2 set: hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/file0</expected-output>
+          <expected-output>^Replication 2 set: hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/file0</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5840,11 +5857,11 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Replication 2 set: hdfs://localhost[.a-z]*:[0-9]*/dir0/file0</expected-output>
+          <expected-output>^Replication 2 set: hdfs://\w+[.a-z]*:[0-9]*/dir0/file0</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Replication 2 set: hdfs://localhost[.a-z]*:[0-9]*/dir0/file1</expected-output>
+          <expected-output>^Replication 2 set: hdfs://\w+[.a-z]*:[0-9]*/dir0/file1</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5862,11 +5879,11 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Replication 2 set: hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/dir0/file0</expected-output>
+          <expected-output>^Replication 2 set: hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir0/file0</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Replication 2 set: hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/dir0/file1</expected-output>
+          <expected-output>^Replication 2 set: hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir0/file1</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5915,7 +5932,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Replication 2 set: hdfs://localhost[.a-z]*:[0-9]*/dir0/file0</expected-output>
+          <expected-output>^Replication 2 set: hdfs://\w+[.a-z]*:[0-9]*/dir0/file0</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5933,11 +5950,11 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Replication 2 set: hdfs://localhost[.a-z]*:[0-9]*/dir0/file0</expected-output>
+          <expected-output>^Replication 2 set: hdfs://\w+[.a-z]*:[0-9]*/dir0/file0</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Replication 2 set: hdfs://localhost[.a-z]*:[0-9]*/dir0/file1</expected-output>
+          <expected-output>^Replication 2 set: hdfs://\w+[.a-z]*:[0-9]*/dir0/file1</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5970,7 +5987,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Replication 2 set: hdfs://localhost[.a-z]*:[0-9]*/dir0/file0</expected-output>
+          <expected-output>^Replication 2 set: hdfs://\w+[.a-z]*:[0-9]*/dir0/file0</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5988,11 +6005,11 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Replication 2 set: hdfs://localhost[.a-z]*:[0-9]*/dir0/file0</expected-output>
+          <expected-output>^Replication 2 set: hdfs://\w+[.a-z]*:[0-9]*/dir0/file0</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Replication 2 set: hdfs://localhost[.a-z]*:[0-9]*/dir0/file1</expected-output>
+          <expected-output>^Replication 2 set: hdfs://\w+[.a-z]*:[0-9]*/dir0/file1</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6008,7 +6025,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^setrep: File does not exist: hdfs://localhost[.a-z]*:[0-9]+/dir0/file</expected-output>
+          <expected-output>^setrep: File does not exist: hdfs://\w+[.a-z]*:[0-9]+/dir0/file</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6030,7 +6047,7 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0( |\t)*hdfs://localhost[.a-z]*:[0-9]*/user/file0</expected-output>
+          <expected-output>^0( |\t)*hdfs://\w+[.a-z]*:[0-9]*/user/file0</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6051,7 +6068,7 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0( |\t)*hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/file0</expected-output>
+          <expected-output>^0( |\t)*hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/file0</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6072,9 +6089,9 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0( |\t)*hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/file0</expected-output>
-          <expected-output>^0( |\t)*hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/file1</expected-output>
-          <expected-output>^0( |\t)*hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/file2</expected-output>
+          <expected-output>^0( |\t)*hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/file0</expected-output>
+          <expected-output>^0( |\t)*hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/file1</expected-output>
+          <expected-output>^0( |\t)*hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/file2</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6112,7 +6129,7 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0( |\t)*hdfs://localhost[.a-z]*:[0-9]*/user/file0</expected-output>
+          <expected-output>^0( |\t)*hdfs://\w+[.a-z]*:[0-9]*/user/file0</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6133,9 +6150,9 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0( |\t)*hdfs://localhost[.a-z]*:[0-9]+/file0</expected-output>
-          <expected-output>^0( |\t)*hdfs://localhost[.a-z]*:[0-9]+/file1</expected-output>
-          <expected-output>^0( |\t)*hdfs://localhost[.a-z]*:[0-9]+/file2</expected-output>
+          <expected-output>^0( |\t)*hdfs://\w+[.a-z]*:[0-9]+/file0</expected-output>
+          <expected-output>^0( |\t)*hdfs://\w+[.a-z]*:[0-9]+/file1</expected-output>
+          <expected-output>^0( |\t)*hdfs://\w+[.a-z]*:[0-9]+/file2</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6173,7 +6190,7 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0( |\t)*hdfs://localhost[.a-z]*:[0-9]*/user/file0</expected-output>
+          <expected-output>^0( |\t)*hdfs://\w+[.a-z]*:[0-9]*/user/file0</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6194,9 +6211,9 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0( )*hdfs://localhost[.a-z]*:[0-9]+/file0</expected-output>
-          <expected-output>^0( )*hdfs://localhost[.a-z]*:[0-9]+/file1</expected-output>
-          <expected-output>^0( )*hdfs://localhost[.a-z]*:[0-9]+/file2</expected-output>
+          <expected-output>^0( )*hdfs://\w+[.a-z]*:[0-9]+/file0</expected-output>
+          <expected-output>^0( )*hdfs://\w+[.a-z]*:[0-9]+/file1</expected-output>
+          <expected-output>^0( )*hdfs://\w+[.a-z]*:[0-9]+/file2</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6213,7 +6230,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>touchz: hdfs://localhost[.a-z]*:[0-9]+/data15bytes must be a zero-length file</expected-output>
+          <expected-output>touchz: hdfs://\w+[.a-z]*:[0-9]+/data15bytes must be a zero-length file</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6326,7 +6343,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^test: File does not exist: hdfs://localhost[.a-z]*:[0-9]+/dir0/file</expected-output>
+          <expected-output>^test: File does not exist: hdfs://\w+[.a-z]*:[0-9]+/dir0/file</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6342,7 +6359,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^test: File does not exist: hdfs://localhost[.a-z]*:[0-9]+/dir</expected-output>
+          <expected-output>^test: File does not exist: hdfs://\w+[.a-z]*:[0-9]+/dir</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6690,7 +6707,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^stat: cannot stat `hdfs://localhost[.a-z]*:[0-9]+/file': No such file or directory</expected-output>
+          <expected-output>^stat: cannot stat `hdfs://\w+[.a-z]*:[0-9]+/file': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6935,7 +6952,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^tail: File does not exist: hdfs://localhost[.a-z]*:[0-9]+/file\*</expected-output>
+          <expected-output>^tail: File does not exist: hdfs://\w+[.a-z]*:[0-9]+/file\*</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6950,7 +6967,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^tail: File does not exist: hdfs://localhost[.a-z]*:[0-9]+/file</expected-output>
+          <expected-output>^tail: File does not exist: hdfs://\w+[.a-z]*:[0-9]+/file</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6985,7 +7002,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://localhost[.a-z]*:[0-9]*/file1</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file1</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7002,7 +7019,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/file1</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/file1</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7019,7 +7036,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://localhost[.a-z]*:[0-9]*/dir1</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/dir1</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7036,7 +7053,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/dir1</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir1</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7086,19 +7103,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://localhost[.a-z]*:[0-9]*/file1</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://localhost[.a-z]*:[0-9]*/file2</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://localhost[.a-z]*:[0-9]*/file3</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file3</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://localhost[.a-z]*:[0-9]*/file4</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file4</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7118,19 +7135,19 @@
      <comparators>
        <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/file1</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/file1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/file2</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/file2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/file3</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/file3</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/file4</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/file4</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7150,19 +7167,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://localhost[.a-z]*:[0-9]*/file1</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://localhost[.a-z]*:[0-9]*/file2</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://localhost[.a-z]*:[0-9]*/file3</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file3</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://localhost[.a-z]*:[0-9]*/file4</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file4</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7182,19 +7199,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/file1</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/file1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/file2</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/file2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/file3</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/file3</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/file4</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/file4</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7214,19 +7231,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://localhost[.a-z]*:[0-9]*/dir1</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/dir1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://localhost[.a-z]*:[0-9]*/dir2</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/dir2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://localhost[.a-z]*:[0-9]*/dir3</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/dir3</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://localhost[.a-z]*:[0-9]*/dir4</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/dir4</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7246,19 +7263,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/dir1</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/dir2</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/dir3</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir3</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/dir4</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir4</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7278,19 +7295,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://localhost[.a-z]*:[0-9]*/dir1</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/dir1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://localhost[.a-z]*:[0-9]*/dir2</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/dir2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://localhost[.a-z]*:[0-9]*/dir3</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/dir3</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://localhost[.a-z]*:[0-9]*/dir4</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/dir4</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7310,19 +7327,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/dir1</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/dir2</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/dir3</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir3</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/dir4</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir4</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7339,7 +7356,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*none( |\t)*inf( |\t)*none( |\t)*inf( |\t)*0( |\t)*1( |\t)*0 hdfs://localhost[.a-z]*:[0-9]*/file1</expected-output>
+          <expected-output>( |\t)*none( |\t)*inf( |\t)*none( |\t)*inf( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file1</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7356,7 +7373,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*none( |\t)*inf( |\t)*none( |\t)*inf( |\t)*0( |\t)*1( |\t)*0 hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/file1</expected-output>
+          <expected-output>( |\t)*none( |\t)*inf( |\t)*none( |\t)*inf( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/file1</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7375,7 +7392,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://localhost[.a-z]*:[0-9]*/dir1</expected-output>
+          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/dir1</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7394,7 +7411,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://localhost[.a-z]*:[0-9]*/user/[a-z]*/dir1</expected-output>

[... 725 lines stripped ...]