Fix for a resource contention in a parallel tests execution (#709)

jfrog · Jun 18, 2024 · 66f7c0d · 66f7c0d
1 parent eb54c38
commit 66f7c0d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/scanpullrequest/scanallpullrequests_test.go b/scanpullrequest/scanallpullrequests_test.go
@@ -101,6 +101,9 @@ func TestShouldNotScanPullRequestError(t *testing.T) {
 func TestScanAllPullRequestsMultiRepo(t *testing.T) {
 	server, restoreEnv := utils.VerifyEnv(t)
 	defer restoreEnv()
+	_, restoreJfrogHomeFunc := utils.CreateTempJfrogHomeWithCallback(t)
+	defer restoreJfrogHomeFunc()
+
 	failOnSecurityIssues := false
 	firstRepoParams := utils.Params{
 		Scan: utils.Scan{

diff --git a/scanrepository/scanmultiplerepositories_test.go b/scanrepository/scanmultiplerepositories_test.go
@@ -25,6 +25,8 @@ var testRepositories = []string{"pip-repo", "npm-repo", "mvn-repo"}
 func TestScanAndFixRepos(t *testing.T) {
 	serverParams, restoreEnv := utils.VerifyEnv(t)
 	defer restoreEnv()
+	_, restoreJfrogHomeFunc := utils.CreateTempJfrogHomeWithCallback(t)
+	defer restoreJfrogHomeFunc()
 
 	baseWd, err := os.Getwd()
 	assert.NoError(t, err)

diff --git a/utils/testsutils.go b/utils/testsutils.go
@@ -131,3 +131,14 @@ func CreateDotGitWithCommit(t *testing.T, wd, port string, repositoriesPath ...s
 		assert.NoError(t, err)
 	}
 }
+
+func CreateTempJfrogHomeWithCallback(t *testing.T) (string, func()) {
+	newJfrogHomeDir, err := fileutils.CreateTempDir()
+	assert.NoError(t, err)
+	prevJfrogHomeDir := os.Getenv(JfrogHomeDirEnv)
+	assert.NoError(t, os.Setenv(JfrogHomeDirEnv, newJfrogHomeDir))
+	return newJfrogHomeDir, func() {
+		assert.NoError(t, os.Setenv(JfrogHomeDirEnv, prevJfrogHomeDir))
+		assert.NoError(t, fileutils.RemoveTempDir(newJfrogHomeDir))
+	}
+}