kubernetes
/
git-sync
mirror of https://github.com/kubernetes/git-sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix tests

This commit is contained in:
Chuanying Du 2019-12-18 17:57:28 -08:00
parent d58a241648
commit 66244108ed
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/git-sync/main.go
View File

@ -693,7 +693,7 @@ func runCommandWithStdin(ctx context.Context, cwd, stdin, command string, args .
} }
func setupGitAuth(ctx context.Context, username, password, gitURL string) error { func setupGitAuth(ctx context.Context, username, password, gitURL string) error {
log.V(1).Info("setting up git credential cache") log.V(1).Info("setting up git credential store")
_, err := runCommand(ctx, "", *flGitCmd, "config", "--global", "credential.helper", "store") _, err := runCommand(ctx, "", *flGitCmd, "config", "--global", "credential.helper", "store")
if err != nil { if err != nil {

4
test_e2e.sh
View File

@ -643,7 +643,7 @@ GIT_SYNC \
--rev=HEAD \ --rev=HEAD \
--root="$ROOT" \ --root="$ROOT" \
--dest="link" \ --dest="link" \
> "$DIR"/log."$TESTCASE" 2>&1 > "$DIR"/log."$TESTCASE" 2>&1 || true
# check for failure # check for failure
assert_file_absent "$ROOT"/link/file assert_file_absent "$ROOT"/link/file
# run with askpass_git with correct password # run with askpass_git with correct password
@ -664,8 +664,6 @@ assert_link_exists "$ROOT"/link
assert_file_exists "$ROOT"/link/file assert_file_exists "$ROOT"/link/file
assert_file_eq "$ROOT"/link/file "$TESTCASE 1" assert_file_eq "$ROOT"/link/file "$TESTCASE 1"
# Wrap up # Wrap up
remove_sync_container
wait
pass pass
############################################## ##############################################