Skip to content

Commit

Permalink
Issue #74: Testing test_datasets.py, using subprocess.run().
Browse files Browse the repository at this point in the history
  • Loading branch information
bongjinkoo committed May 16, 2022
1 parent 7f2d9ed commit 3cd92d2
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
10 changes: 6 additions & 4 deletions ioSPI/datasets.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def ls(self):
"""List all files in the project."""
print(f"Listing files from OSF project: {self.project_id}...")
# os.system("osf ls")
subprocess.run(["osf", "ls"], text=True, capture_output=True)
subprocess.run(f"osf ls", shell=True, text=True, capture_output=True)

def download(self, remote_path: str, local_path: str):
"""Download a file from an OSF project and save it locally.
Expand All @@ -83,7 +83,8 @@ def download(self, remote_path: str, local_path: str):
print(f"Downloading {full_remote_path} to {local_path}...")
# os.system(f"osf fetch {full_remote_path} {local_path}")
subprocess.run(
["osf", "fetch", f"{full_remote_path}, f{local_path}"],
f"osf fetch {full_remote_path} {local_path}",
shell=True,
text=True,
capture_output=True,
)
Expand Down Expand Up @@ -117,7 +118,8 @@ def upload(self, local_path: str, remote_path: str):
print(f"Uploading {local_path} to {full_remote_path}...")
# os.system(f"osf upload {local_path} {full_remote_path}")
subprocess.run(
["osf", "upload", f"{local_path}", f"{full_remote_path}"],
f"osf upload {local_path} {full_remote_path}",
shell=True,
text=True,
capture_output=True,
)
Expand All @@ -142,6 +144,6 @@ def remove(self, remote_path: str):
print(f"Removing {full_remote_path} in the project...")
# os.system(f"osf remove {full_remote_path}")
subprocess.run(
["osf", "remove", f"{full_remote_path}"], text=True, capture_output=True
f"osf remove {full_remote_path}", shell=True, text=True, capture_output=True
)
print("Done!")
8 changes: 6 additions & 2 deletions tests/test_datasets.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,9 @@ def test_upload_valid(setup, set_file_path):
setup.upload(set_file_path[0] + set_file_path[1], set_file_path[1])
file_exists = False
# file_list = os.popen("osf ls")
file_list = subprocess.run(["osf", "ls"], text=True, capture_output=True).stdout
file_list = subprocess.run(
f"osf ls", shell=True, text=True, capture_output=True
).stdout
file_list = io.StringIO(file_list)
line = file_list.readline()
while line:
Expand Down Expand Up @@ -109,7 +111,9 @@ def test_remove_valid(setup, set_file_path):
setup.remove(set_file_path[1])
file_exists = False
# file_list = os.popen("osf ls")
file_list = subprocess.run(["osf", "ls"], text=True, capture_output=True).stdout
file_list = subprocess.run(
f"osf ls", shell=True, text=True, capture_output=True
).stdout
file_list = io.StringIO(file_list)
line = file_list.readline()
while line:
Expand Down

0 comments on commit 3cd92d2

Please sign in to comment.