p85947160
/
gitea
1
0
Fork 1
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fix local runs of ssh-requiring integration tests (#7855)

This commit is contained in:
zeripath 2019-08-14 12:19:13 +01:00 committed by GitHub
parent cbe30783c7
commit 176ba79e96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
integrations/git_helper_for_declarative_test.go
View File

@ -24,20 +24,24 @@ import (
) )
func withKeyFile(t *testing.T, keyname string, callback func(string)) { func withKeyFile(t *testing.T, keyname string, callback func(string)) {
keyFile := filepath.Join(setting.AppDataPath, keyname)
err := ssh.GenKeyPair(keyFile) tmpDir, err := ioutil.TempDir("", "key-file")
assert.NoError(t, err)
defer os.RemoveAll(tmpDir)
err = os.Chmod(tmpDir, 0700)
assert.NoError(t, err)
keyFile := filepath.Join(tmpDir, keyname)
err = ssh.GenKeyPair(keyFile)
assert.NoError(t, err) assert.NoError(t, err)
//Setup ssh wrapper //Setup ssh wrapper
os.Setenv("GIT_SSH_COMMAND", os.Setenv("GIT_SSH_COMMAND",
"ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i "+ "ssh -o \"UserKnownHostsFile=/dev/null\" -o \"StrictHostKeyChecking=no\" -o \"IdentitiesOnly=yes\" -i \""+keyFile+"\"")
filepath.Join(setting.AppWorkPath, keyFile))
os.Setenv("GIT_SSH_VARIANT", "ssh") os.Setenv("GIT_SSH_VARIANT", "ssh")
callback(keyFile) callback(keyFile)
defer os.RemoveAll(keyFile)
defer os.RemoveAll(keyFile + ".pub")
} }
func createSSHUrl(gitPath string, u *url.URL) *url.URL { func createSSHUrl(gitPath string, u *url.URL) *url.URL {