From 176ba79e96f59d9ed04af272b80dfcf62fae3e65 Mon Sep 17 00:00:00 2001
From: zeripath <art27@cantab.net>
Date: Wed, 14 Aug 2019 12:19:13 +0100
Subject: [PATCH] Fix local runs of ssh-requiring integration tests (#7855)
---
integrations/git_helper_for_declarative_test.go | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/integrations/git_helper_for_declarative_test.go b/integrations/git_helper_for_declarative_test.go
index 235f4b4a9b..9190d4bb4e 100644
--- a/integrations/git_helper_for_declarative_test.go
+++ b/integrations/git_helper_for_declarative_test.go
@@ -24,20 +24,24 @@ import (
)
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)
//Setup ssh wrapper
os.Setenv("GIT_SSH_COMMAND",
- "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i "+
- filepath.Join(setting.AppWorkPath, keyFile))
+ "ssh -o \"UserKnownHostsFile=/dev/null\" -o \"StrictHostKeyChecking=no\" -o \"IdentitiesOnly=yes\" -i \""+keyFile+"\"")
os.Setenv("GIT_SSH_VARIANT", "ssh")
callback(keyFile)
-
- defer os.RemoveAll(keyFile)
- defer os.RemoveAll(keyFile + ".pub")
}
func createSSHUrl(gitPath string, u *url.URL) *url.URL {