Merge pull request #50 from ceph/fixes

Fix a doctor crash and two regressions

Author: zmc

ceph_devstack/host.py

@@ -51,9 +51,9 @@ async def arun(
         ).arun()
 
     def path_exists(self, path: Union[str, pathlib.Path]):
-        if isinstance(path, pathlib.Path):
-            return path.exists()
-        return os.path.exists(path)
+        if isinstance(path, str):
+            path = pathlib.Path(path)
+        return path.expanduser().exists()
 
     def hostname(self) -> str:
         name = socket.getfqdn()
@@ -148,8 +148,6 @@ class RemoteHost(Host):
 
     def _remote_args(self, args: List[str], stream_output: bool) -> List[str]:
         remote = list(self.base_args)
-        if stream_output:
-            remote.append("-t")
         remote.append("--")
         remote.extend(args)
         return remote

ceph_devstack/requirements.py

@@ -38,7 +38,8 @@ async def suggest(self):
 
     async def fix(self) -> bool:
         assert self.fix_cmd, "Attempted to fix without a fix command"
-        proc = await self.host.arun(self.fix_cmd, stream_output=True)
+        stream_output = config["args"].get("verbose", False)
+        proc = await self.host.arun(self.fix_cmd, stream_output=stream_output)
         return await proc.wait() == 0
 
 
@@ -94,7 +95,7 @@ async def check(self):
 class PodmanGraphDriver(Requirement):
     async def check(self):
         podman_info = await self.host.podman_info()
-        storage_conf_path = podman_info["store"]["configFile"]
+        storage_conf_path = podman_info["store"].get("configFile", "storage.conf")
         graph_driver = podman_info["store"]["graphDriverName"]
         if graph_driver == "overlay":
             return True

ceph_devstack/resources/ceph/containers.py

@@ -123,7 +123,7 @@ class Archive(Container):
 
     @property
     def archive_dir(self):
-        return Path(config["data_dir"]) / "archive"
+        return (Path(config["data_dir"]) / "archive").expanduser()
 
 
 class Pulpito(Container):
@@ -412,7 +412,7 @@ def create_cmd(self):
 
     @property
     def archive_dir(self) -> Path:
-        return Path(config["data_dir"]) / "archive"
+        return (Path(config["data_dir"]) / "archive").expanduser()
 
     async def create(self):
         self.archive_dir.expanduser().resolve().mkdir(parents=True, exist_ok=True)

tests/test_exec.py

@@ -11,7 +11,7 @@
 def test_remote_host_uses_tty_for_streaming():
     host = RemoteHost()
     cmd = host.cmd(["python", "build.py"], stream_output=True)
-    assert cmd.args == ["podman", "machine", "ssh", "-t", "--", "python", "build.py"]
+    assert cmd.args == ["podman", "machine", "ssh", "--", "python", "build.py"]
 
 
 def test_remote_host_no_tty_for_buffered_remote_cmd():

tests/test_host.py

@@ -0,0 +1,13 @@
+import pytest
+
+from ceph_devstack.host import LocalHost
+
+
+class TestLocalHost:
+    @pytest.fixture
+    def host(self):
+        return LocalHost()
+
+    def test_path_exists_expands_tilde(self, host):
+        assert host.path_exists("~") is True
+        assert host.path_exists("~/nonexistent_dir_12345") is False