Skip to content

Commit d2ed868

Browse files
committed
Fix tests on Windows
1 parent 93ac29f commit d2ed868

File tree

3 files changed

+23
-14
lines changed

3 files changed

+23
-14
lines changed

solc_select/infrastructure/filesystem.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def get_version_source(self) -> str:
7373
return "SOLC_VERSION"
7474

7575
global_version_file = self.config_dir / "global-version"
76-
return str(global_version_file)
76+
return global_version_file.as_posix()
7777

7878
def get_artifact_directory(self, version: SolcVersion) -> Path:
7979
"""Get the directory for a version's artifacts.

solc_select/services/artifact_manager.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -308,15 +308,17 @@ def install_versions(self, versions: List[SolcVersion], silent: bool = False) ->
308308
success_count += 1
309309
if not silent:
310310
print(
311-
f" Version '{version}' installed ({success_count}/{total_count})"
311+
f"[OK] Version '{version}' installed ({success_count}/{total_count})"
312312
)
313313
elif not silent:
314314
print(
315-
f" Version '{version}' failed to install ({success_count}/{total_count})"
315+
f"[FAIL] Version '{version}' failed to install ({success_count}/{total_count})"
316316
)
317317
except SolcSelectError as e:
318318
if not silent:
319-
print(f"✗ Version '{version}' failed: {e} ({success_count}/{total_count})")
319+
print(
320+
f"[FAIL] Version '{version}' failed: {e} ({success_count}/{total_count})"
321+
)
320322

321323
except KeyboardInterrupt:
322324
if not silent:

tests/utils.py

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,20 @@ def run_command(
6262
"""
6363
stderr_setting = subprocess.STDOUT if capture_stderr else subprocess.PIPE
6464

65-
result = subprocess.run(
66-
cmd,
67-
shell=True,
68-
capture_output=False,
69-
stdout=subprocess.PIPE,
70-
stderr=stderr_setting,
71-
text=True,
72-
check=check,
73-
)
74-
return result
65+
try:
66+
return subprocess.run(
67+
cmd,
68+
shell=True,
69+
capture_output=False,
70+
stdout=subprocess.PIPE,
71+
stderr=stderr_setting,
72+
text=True,
73+
check=check,
74+
)
75+
except subprocess.CalledProcessError as e:
76+
print("Command failed with CalledProcessError.")
77+
print("Exit code:", e.returncode)
78+
print("Command:", e.cmd)
79+
print("Stdout:", e.stdout)
80+
print("Stderr:", e.stderr)
81+
raise

0 commit comments

Comments
 (0)