Răsfoiți Sursa

workin on tests

zach rice 7 ani în urmă
părinte
comite
d4925443c8
2 a modificat fișierele cu 10 adăugiri și 6 ștergeri
  1. 8 4
      gitleaks_test.go
  2. 2 2
      main.go

+ 8 - 4
gitleaks_test.go

@@ -684,6 +684,7 @@ func TestAuditRepo(t *testing.T) {
 					whiteListRepos = nil
 				}
 				skip := false
+				totalCommits = 0
 				// config paths
 				if test.configPath != "" {
 					os.Setenv("GITLEAKS_CONFIG", test.configPath)
@@ -695,11 +696,14 @@ func TestAuditRepo(t *testing.T) {
 				}
 				if !skip {
 					leaks, err = auditGitRepo(test.repo)
-
-					if opts.Redact {
-						g.Assert(leaks[0].Offender).Equal("REDACTED")
+					if test.testOpts.Depth != 0 {
+						g.Assert(totalCommits).Equal(test.testOpts.Depth)
+					} else {
+						if opts.Redact {
+							g.Assert(leaks[0].Offender).Equal("REDACTED")
+						}
+						g.Assert(len(leaks)).Equal(test.numLeaks)
 					}
-					g.Assert(len(leaks)).Equal(test.numLeaks)
 				}
 			})
 		})

+ 2 - 2
main.go

@@ -72,7 +72,7 @@ type Options struct {
 
 	CommitStop string `long:"commit-stop" description:"sha of commit to stop at"`
 	Commit     string `long:"commit" description:"sha of commit to investigate"`
-	Depth      int    `long:"depth" description:"maximum commit depth"`
+	Depth      int64  `long:"depth" description:"maximum commit depth"`
 
 	// local target option
 	RepoPath  string `long:"repo-path" description:"Path to repo"`
@@ -509,7 +509,7 @@ func auditGitReference(repo *RepoDescriptor, ref *plumbing.Reference) []Leak {
 		err         error
 		repoName    string
 		leaks       []Leak
-		commitCount int
+		commitCount int64
 		commitWg    sync.WaitGroup
 		mutex       = &sync.Mutex{}
 		semaphore   chan bool