Fix test and format

Author: ACButcher

ppadb/device.py

@@ -85,12 +85,12 @@ def pull(self, src, dest):
         dest = Path(dest)
 
         dir_string = "IS_DIR"
-        res = self.shell(f"[ -d \"{src}\" ] && echo {dir_string}")
+        res = self.shell(f'[ -d "{src}" ] && echo {dir_string}')
         if dir_string in res:
             # Get all files in the dir
             # Pull each
             dest.mkdir(exist_ok=True)
-            cmd = f"ls -1a \"{src}\""
+            cmd = f'ls -1a "{src}"'
             res = self.shell(cmd)
             contents_list = res.split("\n")
             contents_list = [
@@ -102,7 +102,7 @@ def pull(self, src, dest):
                 self.pull(element_src, element_dest)
         else:
             file_string = "IS_FILE"
-            res = self.shell(f"[ -f \"{src}\" ] && echo {file_string}")
+            res = self.shell(f'[ -f "{src}" ] && echo {file_string}')
             if file_string not in res:
                 raise FileNotFoundError(f"Cannot find {src} on device")
             self._pull(str(src), str(dest))

ppadb/device_async.py

@@ -70,12 +70,12 @@ async def pull(self, src, dest):
         dest = Path(dest)
 
         dir_string = "IS_DIR"
-        res = await self.shell(f"[ -d \"{src}\" ] && echo {dir_string}")
+        res = await self.shell(f'[ -d "{src}" ] && echo {dir_string}')
         if dir_string in res:
             # Get all files in the dir
             # Pull each
             dest.mkdir(exist_ok=True)
-            cmd = f"ls -1a \"{src}\""
+            cmd = f'ls -1a "{src}"'
             res = await self.shell(cmd)
             contents_list = res.split("\n")
             contents_list = [
@@ -87,7 +87,7 @@ async def pull(self, src, dest):
                 await self.pull(element_src, element_dest)
         else:
             file_string = "IS_FILE"
-            res = await self.shell(f"[ -f \"{src}\" ] && echo {file_string}")
+            res = await self.shell(f'[ -f "{src}" ] && echo {file_string}')
             if file_string not in res:
                 raise FileNotFoundError(f"Cannot find {src} on device")
             await self._pull(str(src), str(dest))

test/test_device.py

@@ -192,7 +192,7 @@ def test_filepaths():
         "toplevel/subdir1/test4.txt",
         "toplevel/subdir1/subdir2/test5.txt",
         "toplevel/subdir1/subdir2/test6.txt",
-        "toplevel/subdir1/subdir2/file name.txt"
+        "toplevel/subdir1/subdir2/file name.txt",
     ]
     yield filepaths
 
@@ -203,7 +203,7 @@ def populated_device(device, test_filepaths):
 
     device.shell(f"mkdir -p /data/local/tmp/{dirpath}")
     for path in test_filepaths:
-        device.shell(f"echo \"{path}\" > \"/data/local/tmp/{path}\"")
+        device.shell(f'echo "{path}" > "/data/local/tmp/{path}"')
 
     yield device
 
@@ -215,6 +215,7 @@ def working_dir():
     with tempfile.TemporaryDirectory() as f:
         yield pathlib.Path(f)
 
+
 def test_pull_file(populated_device, working_dir):
     populated_device.pull(
         "/data/local/tmp/toplevel/test1.txt", working_dir / "test1.txt"
@@ -223,13 +224,15 @@ def test_pull_file(populated_device, working_dir):
     assert dest_path.is_file()
     assert dest_path.read_text() == "toplevel/test1.txt\n"
 
+
 def test_pull_file_with_space(populated_device, working_dir):
     dest_path = working_dir / "file name.txt"
     populated_device.pull(
-        "/data/local/tmp/toplevel/subdir1/subdir2/file name.txt", dest_path 
+        "/data/local/tmp/toplevel/subdir1/subdir2/file name.txt", dest_path
     )
     assert dest_path.is_file()
-    assert dest_path.read_text() == "toplevel/subdir1/subdir2/file name.txt"
+    assert dest_path.read_text() == "toplevel/subdir1/subdir2/file name.txt\n"
+
 
 def test_pull_dir(populated_device, working_dir):
     populated_device.pull(