trufflesecurity/trufflehog
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make cwd-changing normalization tests non-parallel to fix flaky clone failures (#5178)

Browse Source 
* make cwd-changing normalization tests non-parallel to fix flaky clone failures

* modified to reflect Meredith's review
This commit is contained in:
Jordan Tunstill
2026-08-05 12:05:16 -07:00
committed by GitHub
parent 7d8f10c04d
commit cff30f7ac9
1 changed files with 3 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/sources/git/git_test.go
+3 -34
View File
@@ -1288,19 +1288,9 @@ func TestNormalizeFileURI(t *testing.T) {
func TestPrepareRepoWithNormalization(t *testing.T) {
repoPath := setupTestRepo(t, "test-repo")
t.Chdir(repoPath)
addTestFileAndCommit(t, repoPath, "test.txt", "test content")
originalDir, err := os.Getwd()
if err != nil {
t.Fatalf("failed to get current directory: %v", err)
}
defer func() {
if err := os.Chdir(originalDir); err != nil {
t.Fatalf("failed to restore original directory: %v", err)
}
}()
// Test absolute paths first (without changing directory)
absoluteTests := []struct {
name string
uri string
@@ -1338,11 +1328,6 @@ func TestPrepareRepoWithNormalization(t *testing.T) {
})
}
// Now change to temp directory for relative path tests
if err := os.Chdir(repoPath); err != nil {
t.Fatalf("failed to change to temp directory: %v", err)
}
relativeTests := []struct {
name string
uri string
@@ -1382,12 +1367,12 @@ func TestPrepareRepoWithNormalization(t *testing.T) {
}
func TestPrepareRepoWithNormalizationBare(t *testing.T) {
t.Parallel()
tempDir := t.TempDir()
t.Chdir(tempDir)
workingRepoPath := setupTestRepo(t, "working-repo-original")
addTestFileAndCommit(t, workingRepoPath, "test.txt", "test content")
tempDir := t.TempDir()
bareRepoPath := filepath.Join(tempDir, "bare-repo")
assert.NoError(t, exec.Command("git", "clone", workingRepoPath, bareRepoPath, "--bare").Run())
@@ -1396,17 +1381,6 @@ func TestPrepareRepoWithNormalizationBare(t *testing.T) {
_, err = os.Stat(filepath.Join(bareRepoPath, "HEAD"))
assert.NoError(t, err, "Bare repository should have HEAD file")
originalDir, err := os.Getwd()
if err != nil {
t.Fatalf("failed to get current directory: %v", err)
}
defer func() {
if err := os.Chdir(originalDir); err != nil {
t.Fatalf("failed to restore original directory: %v", err)
}
}()
// Test absolute paths first (without changing directory)
absoluteTests := []struct {
name string
uri string
@@ -1456,11 +1430,6 @@ func TestPrepareRepoWithNormalizationBare(t *testing.T) {
})
}
// Now change to temp directory for relative path tests
if err := os.Chdir(tempDir); err != nil {
t.Fatalf("failed to change to temp directory: %v", err)
}
relativeTests := []struct {
name string
uri string