Merge pull request #1999 from davidmarin/test-touchz

test hadoop fs touchz() (fixes #1981)

tests/fs/test_hadoop.py

@@ -193,8 +193,12 @@ def test_rm_nonexistent(self):
         self.fs.rm('hdfs:///baz')
 
     def test_touchz(self):
-        # mockhadoop doesn't implement this (see #1981)
-        pass
+        self.assertEqual(list(self.fs.ls('hdfs:///')), [])
+
+        self.fs.touchz('hdfs:///empty')
+
+        self.assertEqual(list(self.fs.ls('hdfs:///')),
+                         ['hdfs:///empty'])
 
 
 class Hadoop1FSTestCase(HadoopFSTestCase):

tests/mockhadoop.py

@@ -675,6 +675,35 @@ def hadoop_fs_test(stdout, stderr, environ, *args):
         return 1
 
 
+def hadoop_fs_touchz(stdout, stderr, environ, *args):
+    """Implements hadoop fs -touchz'"""
+    if len(args) < 1:
+        print('Usage: hadoop fs [generic options] -touchz <path> ...]',
+              file=stderr)
+        return -1
+
+    uri = args[0]
+    path = hdfs_uri_to_real_path(uri, environ)
+
+    if os.path.exists(path):
+        if os.path.getsize(path) == 0:
+            return 0
+        else:
+            print(
+                "touchz: `%s': Not a zero-length file" % uri, file=stderr)
+            return 1
+    else:
+        try:
+            with open(path, 'w'):
+                pass
+            return 0
+        except FileNotFoundError:
+            print(
+                "touchz: `%s': No such file or directory: `%s'" % (
+                    uri, uri), file=stderr)
+            return 1
+
+
 def hadoop_jar(stdout, stderr, environ, *args):
     if len(args) < 1:
         print('RunJar jarFile [mainClass] args...', file=stderr)