Fix hdfs tests and touch (#68)

* tests: improve cleanup in htcluster fixture

* tests: restore broken hdfs test in test_core.py

* upath.implementations.hdfs: fix touch

Author: ap--

upath/implementations/hdfs.py

@@ -6,9 +6,9 @@ def __init__(self, parsed_url, *args, **kwargs):
         super().__init__(parsed_url, *args, **kwargs)
         self._fs.root_marker = "/"
 
-    def touch(self, **kwargs):
+    def touch(self, path, **kwargs):
         kwargs.pop("truncate", None)
-        super().touch(self, **kwargs)
+        super().touch(path, **kwargs)
 
 
 class HDFSPath(upath.core.UPath):

upath/tests/conftest.py

@@ -98,21 +98,22 @@ def htcluster():
     except FileNotFoundError as err:
         if err.errno == 2 and "htcluster" == err.filename:
             pytest.skip("htcluster not installed")
-        else:
-            raise
+        raise
 
     time.sleep(30)
-    yield
-    proc.terminate()
-    proc.wait()
-    proc1 = subprocess.Popen(
-        shlex.split("htcluster shutdown"),
-        stderr=subprocess.DEVNULL,
-        stdout=subprocess.DEVNULL,
-    )
-    proc1.terminate()
-    proc1.wait()
-    time.sleep(10)
+    try:
+        yield
+    finally:
+        proc.terminate()
+        proc.wait()
+        proc1 = subprocess.Popen(
+            shlex.split("htcluster shutdown"),
+            stderr=subprocess.DEVNULL,
+            stdout=subprocess.DEVNULL,
+        )
+        proc1.terminate()
+        proc1.wait()
+        time.sleep(10)
 
 
 @pytest.fixture()

upath/tests/test_core.py

@@ -45,8 +45,8 @@ def test_fsspec_compat(self):
 
 
 @pytest.mark.hdfs
-def test_multiple_backend_paths(local_testdir, s3, hdfs):
-    anon, s3so = s3
+def test_multiple_backend_paths(local_testdir, s3_fixture, hdfs):
+    _, anon, s3so = s3_fixture
     path = f"s3:{local_testdir}"
     s3_path = UPath(path, anon=anon, **s3so)
     assert s3_path.joinpath("text.txt")._url.scheme == "s3"