Skip to content

Commit

Permalink
Fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
singiamtel authored and ktf committed Jun 18, 2024
1 parent c178465 commit c3c43bc
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion alibuild_helpers/git.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def checkoutCmd(self, ref):
return ["checkout", "-f", ref]

def fetchCmd(self, source, *refs):
return ["fetch", "-f"] + clone_speedup_options() + [source, *refs]
return ["fetch", "-f"] + clone_speedup_options() + [source, *refs]

def setWriteUrlCmd(self, url):
return ["remote", "set-url", "--push", "origin", url]
Expand Down
2 changes: 1 addition & 1 deletion tests/test_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
GIT_CHECKOUT_ZLIB_ARGS = ("checkout", "-f", "master"), \
"/sw/SOURCES/zlib/v1.2.3/8822efa61f", False

GIT_FETCH_REF_ROOT_ARGS = ("fetch", "-f", "https://github.com/root-mirror/root", "+refs/tags/*:refs/tags/*",
GIT_FETCH_REF_ROOT_ARGS = ("fetch", "-f", "--filter=blob:none", "https://github.com/root-mirror/root", "+refs/tags/*:refs/tags/*",
"+refs/heads/*:refs/heads/*"), "/sw/MIRROR/root", False
GIT_CLONE_SRC_ROOT_ARGS = ("clone", "-n", "https://github.com/root-mirror/root",
"/sw/SOURCES/ROOT/v6-08-30/f7b3366117",
Expand Down
2 changes: 1 addition & 1 deletion tests/test_workarea.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def test_reference_sources_updated(self, mock_git, mock_open, mock_makedirs, moc
mock_exists.assert_has_calls([])
mock_makedirs.assert_called_with("%s/sw/MIRROR" % getcwd(), exist_ok=True)
mock_git.assert_called_once_with([
"fetch", "-f", spec["source"], "+refs/tags/*:refs/tags/*", "+refs/heads/*:refs/heads/*",
"fetch", "-f", "--filter=blob:none", spec["source"], "+refs/tags/*:refs/tags/*", "+refs/heads/*:refs/heads/*",
], directory="%s/sw/MIRROR/aliroot" % getcwd(), check=False, prompt=True)
self.assertEqual(spec.get("reference"), "%s/sw/MIRROR/aliroot" % getcwd())

Expand Down

0 comments on commit c3c43bc

Please sign in to comment.