Skip to content

Commit

Permalink
Uniquification
Browse files Browse the repository at this point in the history
  • Loading branch information
mernst committed Oct 31, 2023
1 parent e17b55d commit daeeffb
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
3 changes: 2 additions & 1 deletion src/python/merge_tester.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ def merge_tester(args: Tuple[str, pd.Series, Path]) -> pd.Series:
repo = Repository(
repo_slug,
cache_directory=cache_directory,
workdir_id=f'merge-tester-{merge_tool}-{merge_data["left"]}-{merge_data["right"]}',
workdir_id=f"merge-tester-{merge_tool.name}-"
+ f'{merge_data["left"]}-{merge_data["right"]}',
)
(
result,
Expand Down
6 changes: 5 additions & 1 deletion src/python/test_repo_heads.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,11 @@ def head_passes_tests(args: Tuple[pd.Series, Path]) -> TEST_STATE:
print("test_repo_heads:", repo_slug, ": head_passes_tests : started")

try:
repo = Repository(repo_slug, cache_directory=cache)
repo = Repository(
repo_slug,
cache_directory=cache,
workdir_id="head-" + repo_info["head hash"],
)
except FileNotFoundError as e:
print("test_repo_heads:", repo_slug, ": head_passes_tests :", e)
return TEST_STATE.Git_checkout_failed
Expand Down

0 comments on commit daeeffb

Please sign in to comment.