hadoop-hdfs-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject svn commit: r1166495 [8/9] - in /hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs: ./ src/main/bin/ src/main/docs/src/documentation/content/xdocs/ src/main/java/ src/main/java/org/apache/hadoop/fs/ src/main/java/org/apache/hadoop/hdfs/ ...
Date Thu, 08 Sep 2011 01:39:32 GMT
Modified: hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml?rev=1166495&r1=1166494&r2=1166495&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml (original)
+++ hadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml Thu Sep  8 01:39:07 2011
@@ -436,7 +436,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^ls: `hdfs://\w+[.a-z]*:[0-9]+/file1': No such file or directory</expected-output>
+          <expected-output>^ls: `hdfs://\w+[-.a-z0-9]*:[0-9]+/file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -887,7 +887,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^ls: `hdfs://\w+[.a-z]*:[0-9]+/file1': No such file or directory</expected-output>
+          <expected-output>^ls: `hdfs://\w+[-.a-z0-9]*:[0-9]+/file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -961,19 +961,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^120\s+hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/data120bytes</expected-output>
+          <expected-output>^120\s+hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/data120bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15\s+hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/data15bytes</expected-output>
+          <expected-output>^15\s+hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/data15bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^30\s+hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/data30bytes</expected-output>
+          <expected-output>^30\s+hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/data30bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^60\s+hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/data60bytes</expected-output>
+          <expected-output>^60\s+hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/data60bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1030,19 +1030,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[-.a-z0-9]*:[0-9]*/dir0/data15bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^30( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/data30bytes</expected-output>
+          <expected-output>^30( |\t)*hdfs://\w+[-.a-z0-9]*:[0-9]*/dir0/data30bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^60( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/data60bytes</expected-output>
+          <expected-output>^60( |\t)*hdfs://\w+[-.a-z0-9]*:[0-9]*/dir0/data60bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^120( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/data120bytes</expected-output>
+          <expected-output>^120( |\t)*hdfs://\w+[-.a-z0-9]*:[0-9]*/dir0/data120bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1079,19 +1079,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^120\s+hdfs://\w+[.a-z]*:[0-9]*/data120bytes</expected-output>
+          <expected-output>^120\s+hdfs://\w+[-.a-z0-9]*:[0-9]*/data120bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15\s+hdfs://\w+[.a-z]*:[0-9]*/data15bytes</expected-output>
+          <expected-output>^15\s+hdfs://\w+[-.a-z0-9]*:[0-9]*/data15bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^30\s+hdfs://\w+[.a-z]*:[0-9]*/data30bytes</expected-output>
+          <expected-output>^30\s+hdfs://\w+[-.a-z0-9]*:[0-9]*/data30bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^60\s+hdfs://\w+[.a-z]*:[0-9]*/data60bytes</expected-output>
+          <expected-output>^60\s+hdfs://\w+[-.a-z0-9]*:[0-9]*/data60bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1153,19 +1153,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[-.a-z0-9]*:[0-9]*/dir0/data15bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^30( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/data30bytes</expected-output>
+          <expected-output>^30( |\t)*hdfs://\w+[-.a-z0-9]*:[0-9]*/dir0/data30bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^60( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/data60bytes</expected-output>
+          <expected-output>^60( |\t)*hdfs://\w+[-.a-z0-9]*:[0-9]*/dir0/data60bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^120( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/data120bytes</expected-output>
+          <expected-output>^120( |\t)*hdfs://\w+[-.a-z0-9]*:[0-9]*/dir0/data120bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1182,7 +1182,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[-.a-z0-9]*:[0-9]*/data15bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1202,19 +1202,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[-.a-z0-9]*:[0-9]*/data15bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^30( |\t)*hdfs://\w+[.a-z]*:[0-9]*/data30bytes</expected-output>
+          <expected-output>^30( |\t)*hdfs://\w+[-.a-z0-9]*:[0-9]*/data30bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^60( |\t)*hdfs://\w+[.a-z]*:[0-9]*/data60bytes</expected-output>
+          <expected-output>^60( |\t)*hdfs://\w+[-.a-z0-9]*:[0-9]*/data60bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^120( |\t)*hdfs://\w+[.a-z]*:[0-9]*/data120bytes</expected-output>
+          <expected-output>^120( |\t)*hdfs://\w+[-.a-z0-9]*:[0-9]*/data120bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1232,7 +1232,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[-.a-z0-9]*:[0-9]*/dir0/data15bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1253,19 +1253,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/data15bytes</expected-output>
+          <expected-output>^15( |\t)*hdfs://\w+[-.a-z0-9]*:[0-9]*/dir0/data15bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^30( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/data30bytes</expected-output>
+          <expected-output>^30( |\t)*hdfs://\w+[-.a-z0-9]*:[0-9]*/dir0/data30bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^60( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/data60bytes</expected-output>
+          <expected-output>^60( |\t)*hdfs://\w+[-.a-z0-9]*:[0-9]*/dir0/data60bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^120( |\t)*hdfs://\w+[.a-z]*:[0-9]*/dir0/data120bytes</expected-output>
+          <expected-output>^120( |\t)*hdfs://\w+[-.a-z0-9]*:[0-9]*/dir0/data120bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1368,7 +1368,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^450\s+hdfs://\w+[.a-z]*:[0-9]*/dir0</expected-output>
+          <expected-output>^450\s+hdfs://\w+[-.a-z0-9]*:[0-9]*/dir0</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1439,7 +1439,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^450\s+hdfs://\w+[.a-z]*:[0-9]*/dir0</expected-output>
+          <expected-output>^450\s+hdfs://\w+[-.a-z0-9]*:[0-9]*/dir0</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1471,7 +1471,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^450\s+hdfs://\w+[.a-z]*:[0-9]*/dir0</expected-output>
+          <expected-output>^450\s+hdfs://\w+[-.a-z0-9]*:[0-9]*/dir0</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1509,7 +1509,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^450\s+hdfs://\w+[.a-z]*:[0-9]*/dir0</expected-output>
+          <expected-output>^450\s+hdfs://\w+[-.a-z0-9]*:[0-9]*/dir0</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1909,7 +1909,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^ls: `hdfs://\w+[.a-z]*:[0-9]+/file1': No such file or directory</expected-output>
+          <expected-output>^ls: `hdfs://\w+[-.a-z0-9]*:[0-9]+/file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1924,7 +1924,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^mv: `hdfs://\w+[.a-z]*:[0-9]+/file1': No such file or directory</expected-output>
+          <expected-output>^mv: `hdfs://\w+[-.a-z0-9]*:[0-9]+/file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1958,7 +1958,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^ls: `hdfs://\w+[.a-z]*:[0-9]+/file1': No such file or directory</expected-output>
+          <expected-output>^ls: `hdfs://\w+[-.a-z0-9]*:[0-9]+/file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -2002,7 +2002,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^ls: `hdfs://\w+[.a-z]*:[0-9]+/file\*': No such file or directory</expected-output>
+          <expected-output>^ls: `hdfs://\w+[-.a-z0-9]*:[0-9]+/file\*': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -2936,7 +2936,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^cp: `hdfs://\w+[.a-z]*:[0-9]+/file': No such file or directory</expected-output>
+          <expected-output>^cp: `hdfs://\w+[-.a-z0-9]*:[0-9]+/file': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -2957,7 +2957,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^cp: `hdfs://\w+[.a-z]*:[0-9]+/file5': Is not a directory</expected-output>
+          <expected-output>^cp: `hdfs://\w+[-.a-z0-9]*:[0-9]+/file5': Is not a directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -2978,7 +2978,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^cp: `hdfs://\w+[.a-z]*:[0-9]+/file5': Is not a directory</expected-output>
+          <expected-output>^cp: `hdfs://\w+[-.a-z0-9]*:[0-9]+/file5': Is not a directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -2998,7 +2998,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^cp: `hdfs://\w+[.a-z]*:[0-9]+/dir': No such file or directory</expected-output>
+          <expected-output>^cp: `hdfs://\w+[-.a-z0-9]*:[0-9]+/dir': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3018,7 +3018,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^cp: `hdfs://\w+[.a-z]*:[0-9]+/dir': No such file or directory</expected-output>
+          <expected-output>^cp: `hdfs://\w+[-.a-z0-9]*:[0-9]+/dir': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3159,19 +3159,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir0/file0</expected-output>
+          <expected-output>^Deleted hdfs://\w+[-.a-z0-9]*:[0-9]*/dir0/file0</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir0/file1</expected-output>
+          <expected-output>^Deleted hdfs://\w+[-.a-z0-9]*:[0-9]*/dir0/file1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir0/file2</expected-output>
+          <expected-output>^Deleted hdfs://\w+[-.a-z0-9]*:[0-9]*/dir0/file2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir0/file3</expected-output>
+          <expected-output>^Deleted hdfs://\w+[-.a-z0-9]*:[0-9]*/dir0/file3</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3191,19 +3191,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/file0</expected-output>
+          <expected-output>^Deleted hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/file0</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/file1</expected-output>
+          <expected-output>^Deleted hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/file1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/file2</expected-output>
+          <expected-output>^Deleted hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/file2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/file3</expected-output>
+          <expected-output>^Deleted hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/file3</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3306,19 +3306,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/file0</expected-output>
+          <expected-output>^Deleted hdfs://\w+[-.a-z0-9]*:[0-9]*/file0</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/file1</expected-output>
+          <expected-output>^Deleted hdfs://\w+[-.a-z0-9]*:[0-9]*/file1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/file2</expected-output>
+          <expected-output>^Deleted hdfs://\w+[-.a-z0-9]*:[0-9]*/file2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/file3</expected-output>
+          <expected-output>^Deleted hdfs://\w+[-.a-z0-9]*:[0-9]*/file3</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3401,7 +3401,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/file0</expected-output>
+          <expected-output>^Deleted hdfs://\w+[-.a-z0-9]*:[0-9]*/file0</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3421,19 +3421,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/file0</expected-output>
+          <expected-output>^Deleted hdfs://\w+[-.a-z0-9]*:[0-9]*/file0</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/file1</expected-output>
+          <expected-output>^Deleted hdfs://\w+[-.a-z0-9]*:[0-9]*/file1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/file2</expected-output>
+          <expected-output>^Deleted hdfs://\w+[-.a-z0-9]*:[0-9]*/file2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/file3</expected-output>
+          <expected-output>^Deleted hdfs://\w+[-.a-z0-9]*:[0-9]*/file3</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3450,7 +3450,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>rm: `hdfs://\w+[.a-z]*:[0-9]*/dir0': No such file or directory</expected-output>
+          <expected-output>rm: `hdfs://\w+[-.a-z0-9]*:[0-9]*/dir0': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3467,7 +3467,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^rm: `hdfs://\w+[.a-z]*:[0-9]*/file0': No such file or directory</expected-output>
+          <expected-output>^rm: `hdfs://\w+[-.a-z0-9]*:[0-9]*/file0': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3487,19 +3487,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/file0</expected-output>
+          <expected-output>^Deleted hdfs://\w+[-.a-z0-9]*:[0-9]*/file0</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/file1</expected-output>
+          <expected-output>^Deleted hdfs://\w+[-.a-z0-9]*:[0-9]*/file1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/file2</expected-output>
+          <expected-output>^Deleted hdfs://\w+[-.a-z0-9]*:[0-9]*/file2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/file3</expected-output>
+          <expected-output>^Deleted hdfs://\w+[-.a-z0-9]*:[0-9]*/file3</expected-output>
        </comparator>
       </comparators>
     </test>
@@ -3588,19 +3588,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir0</expected-output>
+          <expected-output>^Deleted hdfs://\w+[-.a-z0-9]*:[0-9]*/dir0</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir1</expected-output>
+          <expected-output>^Deleted hdfs://\w+[-.a-z0-9]*:[0-9]*/dir1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir2</expected-output>
+          <expected-output>^Deleted hdfs://\w+[-.a-z0-9]*:[0-9]*/dir2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir3</expected-output>
+          <expected-output>^Deleted hdfs://\w+[-.a-z0-9]*:[0-9]*/dir3</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3620,19 +3620,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir0</expected-output>
+          <expected-output>^Deleted hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/dir0</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir1</expected-output>
+          <expected-output>^Deleted hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/dir1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir2</expected-output>
+          <expected-output>^Deleted hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/dir2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir3</expected-output>
+          <expected-output>^Deleted hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/dir3</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3718,19 +3718,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir0</expected-output>
+          <expected-output>^Deleted hdfs://\w+[-.a-z0-9]*:[0-9]*/dir0</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir1</expected-output>
+          <expected-output>^Deleted hdfs://\w+[-.a-z0-9]*:[0-9]*/dir1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir2</expected-output>
+          <expected-output>^Deleted hdfs://\w+[-.a-z0-9]*:[0-9]*/dir2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir3</expected-output>
+          <expected-output>^Deleted hdfs://\w+[-.a-z0-9]*:[0-9]*/dir3</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3795,7 +3795,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/file0</expected-output>
+          <expected-output>^Deleted hdfs://\w+[-.a-z0-9]*:[0-9]*/file0</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3812,7 +3812,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir0</expected-output>
+          <expected-output>^Deleted hdfs://\w+[-.a-z0-9]*:[0-9]*/dir0</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3832,19 +3832,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir0</expected-output>
+          <expected-output>^Deleted hdfs://\w+[-.a-z0-9]*:[0-9]*/dir0</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir1</expected-output>
+          <expected-output>^Deleted hdfs://\w+[-.a-z0-9]*:[0-9]*/dir1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir2</expected-output>
+          <expected-output>^Deleted hdfs://\w+[-.a-z0-9]*:[0-9]*/dir2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir3</expected-output>
+          <expected-output>^Deleted hdfs://\w+[-.a-z0-9]*:[0-9]*/dir3</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3860,7 +3860,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^rm: `hdfs://\w+[.a-z]*:[0-9]*/file0': No such file or directory</expected-output>
+          <expected-output>^rm: `hdfs://\w+[-.a-z0-9]*:[0-9]*/file0': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3880,19 +3880,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir0</expected-output>
+          <expected-output>^Deleted hdfs://\w+[-.a-z0-9]*:[0-9]*/dir0</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir1</expected-output>
+          <expected-output>^Deleted hdfs://\w+[-.a-z0-9]*:[0-9]*/dir1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir2</expected-output>
+          <expected-output>^Deleted hdfs://\w+[-.a-z0-9]*:[0-9]*/dir2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Deleted hdfs://\w+[.a-z]*:[0-9]*/dir3</expected-output>
+          <expected-output>^Deleted hdfs://\w+[-.a-z0-9]*:[0-9]*/dir3</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4316,7 +4316,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15\s+hdfs://\w+[.a-z]*:[0-9]*/data15bytes</expected-output>
+          <expected-output>^15\s+hdfs://\w+[-.a-z0-9]*:[0-9]*/data15bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4333,23 +4333,23 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^120\s+hdfs://\w+[.a-z]*:[0-9]*/dir1/data/data120bytes</expected-output>
+          <expected-output>^120\s+hdfs://\w+[-.a-z0-9]*:[0-9]*/dir1/data/data120bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^1065\s+hdfs://\w+[.a-z]*:[0-9]*/dir1/data/data1k</expected-output>
+          <expected-output>^1065\s+hdfs://\w+[-.a-z0-9]*:[0-9]*/dir1/data/data1k</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15\s+hdfs://\w+[.a-z]*:[0-9]*/dir1/data/data15bytes</expected-output>
+          <expected-output>^15\s+hdfs://\w+[-.a-z0-9]*:[0-9]*/dir1/data/data15bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^30\s+hdfs://\w+[.a-z]*:[0-9]*/dir1/data/data30bytes</expected-output>
+          <expected-output>^30\s+hdfs://\w+[-.a-z0-9]*:[0-9]*/dir1/data/data30bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^60\s+hdfs://\w+[.a-z]*:[0-9]*/dir1/data/data60bytes</expected-output>
+          <expected-output>^60\s+hdfs://\w+[-.a-z0-9]*:[0-9]*/dir1/data/data60bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4367,11 +4367,11 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15\s+hdfs://\w+[.a-z]*:[0-9]*/dir0/data15bytes</expected-output>
+          <expected-output>^15\s+hdfs://\w+[-.a-z0-9]*:[0-9]*/dir0/data15bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^30\s+hdfs://\w+[.a-z]*:[0-9]*/dir0/data30bytes</expected-output>
+          <expected-output>^30\s+hdfs://\w+[-.a-z0-9]*:[0-9]*/dir0/data30bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4404,7 +4404,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^put: `hdfs://\w+[.a-z]*:[0-9]+/user/file0': File exists</expected-output>
+          <expected-output>^put: `hdfs://\w+[-.a-z0-9]*:[0-9]+/user/file0': File exists</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4421,7 +4421,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^put: `hdfs://\w+[.a-z]*:[0-9]+/file0': Is not a directory</expected-output>
+          <expected-output>^put: `hdfs://\w+[-.a-z0-9]*:[0-9]+/file0': Is not a directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4437,7 +4437,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^put: `hdfs://\w+[.a-z]*:[0-9]+/wrongdir': No such file or directory</expected-output>
+          <expected-output>^put: `hdfs://\w+[-.a-z0-9]*:[0-9]+/wrongdir': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4839,7 +4839,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15\s+hdfs://\w+[.a-z]*:[0-9]*/data15bytes</expected-output>
+          <expected-output>^15\s+hdfs://\w+[-.a-z0-9]*:[0-9]*/data15bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4859,7 +4859,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15\s+hdfs://\w+[.a-z]*:[0-9]*/dir0/dir1/data/data15bytes</expected-output>
+          <expected-output>^15\s+hdfs://\w+[-.a-z0-9]*:[0-9]*/dir0/dir1/data/data15bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4877,11 +4877,11 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15\s+hdfs://\w+[.a-z]*:[0-9]*/dir0/data15bytes</expected-output>
+          <expected-output>^15\s+hdfs://\w+[-.a-z0-9]*:[0-9]*/dir0/data15bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^30\s+hdfs://\w+[.a-z]*:[0-9]*/dir0/data30bytes</expected-output>
+          <expected-output>^30\s+hdfs://\w+[-.a-z0-9]*:[0-9]*/dir0/data30bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4914,7 +4914,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>copyFromLocal: `hdfs://\w+[.a-z]*:[0-9]+/user/file0': File exists</expected-output>
+          <expected-output>copyFromLocal: `hdfs://\w+[-.a-z0-9]*:[0-9]+/user/file0': File exists</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4931,7 +4931,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^copyFromLocal: `hdfs://\w+[.a-z]*:[0-9]+/file0': Is not a directory</expected-output>
+          <expected-output>^copyFromLocal: `hdfs://\w+[-.a-z0-9]*:[0-9]+/file0': Is not a directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4947,7 +4947,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^copyFromLocal: `hdfs://\w+[.a-z]*:[0-9]+/wrongdir': No such file or directory</expected-output>
+          <expected-output>^copyFromLocal: `hdfs://\w+[-.a-z0-9]*:[0-9]+/wrongdir': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5365,7 +5365,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^cat: `hdfs://\w+[.a-z]*:[0-9]*/file': No such file or directory</expected-output>
+          <expected-output>^cat: `hdfs://\w+[-.a-z0-9]*:[0-9]*/file': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5382,7 +5382,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^cat: `hdfs://\w+[.a-z]*:[0-9]*/dir1': Is a directory</expected-output>
+          <expected-output>^cat: `hdfs://\w+[-.a-z0-9]*:[0-9]*/dir1': Is a directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5505,19 +5505,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0\s+hdfs://\w+[.a-z]*:[0-9]*/dir0</expected-output>
+          <expected-output>^0\s+hdfs://\w+[-.a-z0-9]*:[0-9]*/dir0</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0\s+hdfs://\w+[.a-z]*:[0-9]*/dir1</expected-output>
+          <expected-output>^0\s+hdfs://\w+[-.a-z0-9]*:[0-9]*/dir1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0\s+hdfs://\w+[.a-z]*:[0-9]*/dir2</expected-output>
+          <expected-output>^0\s+hdfs://\w+[-.a-z0-9]*:[0-9]*/dir2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0\s+hdfs://\w+[.a-z]*:[0-9]*/dir3</expected-output>
+          <expected-output>^0\s+hdfs://\w+[-.a-z0-9]*:[0-9]*/dir3</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5537,19 +5537,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0\s+hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir0</expected-output>
+          <expected-output>^0\s+hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/dir0</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0\s+hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir1</expected-output>
+          <expected-output>^0\s+hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/dir1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0\s+hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir2</expected-output>
+          <expected-output>^0\s+hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/dir2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0\s+hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir3</expected-output>
+          <expected-output>^0\s+hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/dir3</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5617,19 +5617,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0\s+hdfs://\w+[.a-z]*:[0-9]*/dir0</expected-output>
+          <expected-output>^0\s+hdfs://\w+[-.a-z0-9]*:[0-9]*/dir0</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0\s+hdfs://\w+[.a-z]*:[0-9]*/dir1</expected-output>
+          <expected-output>^0\s+hdfs://\w+[-.a-z0-9]*:[0-9]*/dir1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0\s+hdfs://\w+[.a-z]*:[0-9]*/dir2</expected-output>
+          <expected-output>^0\s+hdfs://\w+[-.a-z0-9]*:[0-9]*/dir2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0\s+hdfs://\w+[.a-z]*:[0-9]*/dir3</expected-output>
+          <expected-output>^0\s+hdfs://\w+[-.a-z0-9]*:[0-9]*/dir3</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5680,7 +5680,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0\s+hdfs://\w+[.a-z]*:[0-9]*/dir0</expected-output>
+          <expected-output>^0\s+hdfs://\w+[-.a-z0-9]*:[0-9]*/dir0</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5697,19 +5697,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0\s+hdfs://\w+[.a-z]*:[0-9]*/dir0</expected-output>
+          <expected-output>^0\s+hdfs://\w+[-.a-z0-9]*:[0-9]*/dir0</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0\s+hdfs://\w+[.a-z]*:[0-9]*/dir1</expected-output>
+          <expected-output>^0\s+hdfs://\w+[-.a-z0-9]*:[0-9]*/dir1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0\s+hdfs://\w+[.a-z]*:[0-9]*/dir2</expected-output>
+          <expected-output>^0\s+hdfs://\w+[-.a-z0-9]*:[0-9]*/dir2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0\s+hdfs://\w+[.a-z]*:[0-9]*/dir3</expected-output>
+          <expected-output>^0\s+hdfs://\w+[-.a-z0-9]*:[0-9]*/dir3</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5726,7 +5726,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>mkdir: `hdfs://\w+[.a-z]*:[0-9]+/dir0': File exists</expected-output>
+          <expected-output>mkdir: `hdfs://\w+[-.a-z0-9]*:[0-9]+/dir0': File exists</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5743,7 +5743,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>mkdir: `hdfs://\w+[.a-z]*:[0-9]+/data15bytes': Is not a directory</expected-output>
+          <expected-output>mkdir: `hdfs://\w+[-.a-z0-9]*:[0-9]+/data15bytes': Is not a directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5926,7 +5926,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Replication 2 set: hdfs://\w+[.a-z]*:[0-9]*/dir0/file0</expected-output>
+          <expected-output>^Replication 2 set: hdfs://\w+[-.a-z0-9]*:[0-9]*/dir0/file0</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5944,11 +5944,11 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Replication 2 set: hdfs://\w+[.a-z]*:[0-9]*/dir0/file0</expected-output>
+          <expected-output>^Replication 2 set: hdfs://\w+[-.a-z0-9]*:[0-9]*/dir0/file0</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^Replication 2 set: hdfs://\w+[.a-z]*:[0-9]*/dir0/file1</expected-output>
+          <expected-output>^Replication 2 set: hdfs://\w+[-.a-z0-9]*:[0-9]*/dir0/file1</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5964,7 +5964,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^setrep: `hdfs://\w+[.a-z]*:[0-9]+/dir0/file': No such file or directory</expected-output>
+          <expected-output>^setrep: `hdfs://\w+[-.a-z0-9]*:[0-9]+/dir0/file': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6016,9 +6016,9 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <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>
+          <expected-output>^0( |\t)*hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/file0</expected-output>
+          <expected-output>^0( |\t)*hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/file1</expected-output>
+          <expected-output>^0( |\t)*hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/file2</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6069,9 +6069,9 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <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>
+          <expected-output>^0( |\t)*hdfs://\w+[-.a-z0-9]*:[0-9]+/file0</expected-output>
+          <expected-output>^0( |\t)*hdfs://\w+[-.a-z0-9]*:[0-9]+/file1</expected-output>
+          <expected-output>^0( |\t)*hdfs://\w+[-.a-z0-9]*:[0-9]+/file2</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6105,7 +6105,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0\s+hdfs://\w+[.a-z]*:[0-9]*/user/file0</expected-output>
+          <expected-output>^0\s+hdfs://\w+[-.a-z0-9]*:[0-9]*/user/file0</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6122,9 +6122,9 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^0\s+hdfs://\w+[.a-z]*:[0-9]+/file0</expected-output>
-          <expected-output>^0\s+hdfs://\w+[.a-z]*:[0-9]+/file1</expected-output>
-          <expected-output>^0\s+hdfs://\w+[.a-z]*:[0-9]+/file2</expected-output>
+          <expected-output>^0\s+hdfs://\w+[-.a-z0-9]*:[0-9]+/file0</expected-output>
+          <expected-output>^0\s+hdfs://\w+[-.a-z0-9]*:[0-9]+/file1</expected-output>
+          <expected-output>^0\s+hdfs://\w+[-.a-z0-9]*:[0-9]+/file2</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6141,7 +6141,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>touchz: `hdfs://\w+[.a-z]*:[0-9]+/data15bytes': Not a zero-length file</expected-output>
+          <expected-output>touchz: `hdfs://\w+[-.a-z0-9]*:[0-9]+/data15bytes': Not a zero-length file</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6254,7 +6254,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^test: `hdfs://\w+[.a-z]*:[0-9]+/dir0/file': No such file or directory</expected-output>
+          <expected-output>^test: `hdfs://\w+[-.a-z0-9]*:[0-9]+/dir0/file': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6270,7 +6270,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^test: `hdfs://\w+[.a-z]*:[0-9]+/dir': No such file or directory</expected-output>
+          <expected-output>^test: `hdfs://\w+[-.a-z0-9]*:[0-9]+/dir': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6618,7 +6618,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^stat: `hdfs://\w+[.a-z]*:[0-9]+/file': No such file or directory</expected-output>
+          <expected-output>^stat: `hdfs://\w+[-.a-z0-9]*:[0-9]+/file': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6863,7 +6863,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^tail: `hdfs://\w+[.a-z]*:[0-9]+/file\*': No such file or directory</expected-output>
+          <expected-output>^tail: `hdfs://\w+[-.a-z0-9]*:[0-9]+/file\*': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6878,7 +6878,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^tail: `hdfs://\w+[.a-z]*:[0-9]+/file': No such file or directory</expected-output>
+          <expected-output>^tail: `hdfs://\w+[-.a-z0-9]*:[0-9]+/file': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6895,7 +6895,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^tail: `hdfs://\w+[.a-z]*:[0-9]+/dir1': Is a directory</expected-output>
+          <expected-output>^tail: `hdfs://\w+[-.a-z0-9]*:[0-9]+/dir1': Is a directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6913,7 +6913,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file1</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/file1</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6930,7 +6930,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/file1</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/file1</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6947,7 +6947,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/dir1</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/dir1</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6964,7 +6964,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir1</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/dir1</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7014,19 +7014,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file1</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/file1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file2</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/file2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file3</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/file3</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file4</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/file4</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7046,19 +7046,19 @@
      <comparators>
        <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/file1</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/file1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/file2</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/file2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/file3</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/file3</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/file4</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/file4</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7078,19 +7078,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file1</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/file1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file2</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/file2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file3</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/file3</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file4</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/file4</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7110,19 +7110,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/file1</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/file1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/file2</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/file2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/file3</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/file3</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/file4</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/file4</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7142,19 +7142,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/dir1</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/dir1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/dir2</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/dir2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/dir3</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/dir3</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/dir4</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/dir4</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7174,19 +7174,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir1</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/dir1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir2</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/dir2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir3</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/dir3</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir4</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/dir4</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7206,19 +7206,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/dir1</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/dir1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/dir2</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/dir2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/dir3</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/dir3</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/dir4</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/dir4</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7238,19 +7238,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir1</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/dir1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir2</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/dir2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir3</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/dir3</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir4</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/dir4</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7267,7 +7267,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <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>
+          <expected-output>( |\t)*none( |\t)*inf( |\t)*none( |\t)*inf( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/file1</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7284,7 +7284,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <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>
+          <expected-output>( |\t)*none( |\t)*inf( |\t)*none( |\t)*inf( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/file1</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7303,7 +7303,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <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>
+          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/dir1</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7322,7 +7322,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir1</expected-output>
+          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/dir1</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7372,19 +7372,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <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>
+          <expected-output>( |\t)*none( |\t)*inf( |\t)*none( |\t)*inf( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/file1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*none( |\t)*inf( |\t)*none( |\t)*inf( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file2</expected-output>
+          <expected-output>( |\t)*none( |\t)*inf( |\t)*none( |\t)*inf( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/file2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*none( |\t)*inf( |\t)*none( |\t)*inf( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file3</expected-output>
+          <expected-output>( |\t)*none( |\t)*inf( |\t)*none( |\t)*inf( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/file3</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*none( |\t)*inf( |\t)*none( |\t)*inf( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file4</expected-output>
+          <expected-output>( |\t)*none( |\t)*inf( |\t)*none( |\t)*inf( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/file4</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7404,19 +7404,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <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>
+          <expected-output>( |\t)*none( |\t)*inf( |\t)*none( |\t)*inf( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/file1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <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]*/file2</expected-output>
+          <expected-output>( |\t)*none( |\t)*inf( |\t)*none( |\t)*inf( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/file2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <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]*/file3</expected-output>
+          <expected-output>( |\t)*none( |\t)*inf( |\t)*none( |\t)*inf( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/file3</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <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]*/file4</expected-output>
+          <expected-output>( |\t)*none( |\t)*inf( |\t)*none( |\t)*inf( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/file4</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7436,19 +7436,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <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>
+          <expected-output>( |\t)*none( |\t)*inf( |\t)*none( |\t)*inf( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/file1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*none( |\t)*inf( |\t)*none( |\t)*inf( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file2</expected-output>
+          <expected-output>( |\t)*none( |\t)*inf( |\t)*none( |\t)*inf( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/file2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*none( |\t)*inf( |\t)*none( |\t)*inf( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file3</expected-output>
+          <expected-output>( |\t)*none( |\t)*inf( |\t)*none( |\t)*inf( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/file3</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*none( |\t)*inf( |\t)*none( |\t)*inf( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file4</expected-output>
+          <expected-output>( |\t)*none( |\t)*inf( |\t)*none( |\t)*inf( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/file4</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7468,19 +7468,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <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>
+          <expected-output>( |\t)*none( |\t)*inf( |\t)*none( |\t)*inf( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/file1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <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]*/file2</expected-output>
+          <expected-output>( |\t)*none( |\t)*inf( |\t)*none( |\t)*inf( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/file2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <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]*/file3</expected-output>
+          <expected-output>( |\t)*none( |\t)*inf( |\t)*none( |\t)*inf( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/file3</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <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]*/file4</expected-output>
+          <expected-output>( |\t)*none( |\t)*inf( |\t)*none( |\t)*inf( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/file4</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7508,19 +7508,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <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>
+          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/dir1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/dir2</expected-output>
+          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/dir2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/dir3</expected-output>
+          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/dir3</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/dir4</expected-output>
+          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/dir4</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7548,19 +7548,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir1</expected-output>
+          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/dir1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir2</expected-output>
+          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/dir2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir3</expected-output>
+          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/dir3</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir4</expected-output>
+          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/dir4</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7588,19 +7588,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <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>
+          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/dir1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/dir2</expected-output>
+          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/dir2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/dir3</expected-output>
+          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/dir3</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/dir4</expected-output>
+          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/dir4</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7628,19 +7628,19 @@
       <comparators>
       <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir1</expected-output>
+          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/dir1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir2</expected-output>
+          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/dir2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir3</expected-output>
+          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/dir3</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/user/[a-z]*/dir4</expected-output>
+          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/user/[a-z]*/dir4</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7657,7 +7657,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file1</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/file1</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7674,7 +7674,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/dir1</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/dir1</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7709,19 +7709,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file1</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/file1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file2</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/file2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file3</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/file3</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file4</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/file4</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7741,19 +7741,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file1</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/file1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file2</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/file2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file3</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/file3</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file4</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/file4</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7773,19 +7773,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/dir1</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/dir1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/dir2</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/dir2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/dir3</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/dir3</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/dir4</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/dir4</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7805,19 +7805,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/dir1</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/dir1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/dir2</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/dir2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/dir3</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/dir3</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/dir4</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/dir4</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7834,7 +7834,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <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>
+          <expected-output>( |\t)*none( |\t)*inf( |\t)*none( |\t)*inf( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/file1</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7853,7 +7853,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <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>
+          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/dir1</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7888,19 +7888,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <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>
+          <expected-output>( |\t)*none( |\t)*inf( |\t)*none( |\t)*inf( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/file1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*none( |\t)*inf( |\t)*none( |\t)*inf( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file2</expected-output>
+          <expected-output>( |\t)*none( |\t)*inf( |\t)*none( |\t)*inf( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/file2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*none( |\t)*inf( |\t)*none( |\t)*inf( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file3</expected-output>
+          <expected-output>( |\t)*none( |\t)*inf( |\t)*none( |\t)*inf( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/file3</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-         <expected-output>( |\t)*none( |\t)*inf( |\t)*none( |\t)*inf( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file4</expected-output>
+         <expected-output>( |\t)*none( |\t)*inf( |\t)*none( |\t)*inf( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/file4</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7920,19 +7920,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <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>
+          <expected-output>( |\t)*none( |\t)*inf( |\t)*none( |\t)*inf( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/file1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*none( |\t)*inf( |\t)*none( |\t)*inf( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file2</expected-output>
+          <expected-output>( |\t)*none( |\t)*inf( |\t)*none( |\t)*inf( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/file2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*none( |\t)*inf( |\t)*none( |\t)*inf( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file3</expected-output>
+          <expected-output>( |\t)*none( |\t)*inf( |\t)*none( |\t)*inf( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/file3</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*none( |\t)*inf( |\t)*none( |\t)*inf( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file4</expected-output>
+          <expected-output>( |\t)*none( |\t)*inf( |\t)*none( |\t)*inf( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/file4</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7960,19 +7960,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <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>
+          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/dir1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/dir2</expected-output>
+          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/dir2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/dir3</expected-output>
+          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/dir3</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/dir4</expected-output>
+          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/dir4</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -8000,19 +8000,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <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>
+          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/dir1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/dir2</expected-output>
+          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/dir2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/dir3</expected-output>
+          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/dir3</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/dir4</expected-output>
+          <expected-output>( |\t)*10( |\t)*9( |\t)*1048576( |\t)*1048576( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/dir4</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -8029,7 +8029,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file1</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/file1</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -8046,7 +8046,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/dir1</expected-output>
+          <expected-output>( |\t)*1( |\t)*0( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/dir1</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -8061,7 +8061,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>count: `hdfs://\w+[.a-z]*:[0-9]+/file1': No such file or directory</expected-output>
+          <expected-output>count: `hdfs://\w+[-.a-z0-9]*:[0-9]+/file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -8081,19 +8081,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file1</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/file1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file2</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/file2</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file3</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/file3</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file4</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/file4</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -8113,19 +8113,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file1</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[-.a-z0-9]*:[0-9]*/file1</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 hdfs://\w+[.a-z]*:[0-9]*/file2</expected-output>

[... 291 lines stripped ...]


Mime
View raw message