Skip to content

Commit 6913691

Browse files
committed
remove comments
1 parent 5bfa05d commit 6913691

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

commands/audit/audit.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,6 @@ func ProcessResultsAndOutput(auditResults *results.SecurityCommandResults, outpu
222222
return
223223
}
224224
// Only in case Xray's context was given (!auditCmd.IncludeVulnerabilities), and the user asked to fail the build accordingly, do so.
225-
// TODO eran fix the failBuild condition here as well and fix all relevant tests accordingly (run in CI) - fixed
226225
if failBuild && auditResults.HasViolationContext() && results.CheckIfFailBuild(auditResults.GetScaScansXrayResults()) {
227226
err = results.NewFailBuildError()
228227
}

git_test.go

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package main
22

33
import (
4+
"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
45
"path/filepath"
56
"testing"
67

@@ -86,14 +87,10 @@ func TestGitAuditSimpleJson(t *testing.T) {
8687
)
8788
}
8889

89-
// TODO eran fix this flaky test - remove Ubuntu restriction in local
9090
func TestGitAuditViolationsWithIgnoreRule(t *testing.T) {
91-
/*
92-
if !coreutils.IsLinux() {
93-
t.Skip("Skipping test. This test only runs on Linux to avoid flaky tests when running in parallel tests.")
94-
}
95-
96-
*/
91+
if !coreutils.IsLinux() {
92+
t.Skip("Skipping test. This test only runs on Linux to avoid flaky tests when running in parallel tests.")
93+
}
9794
xrayVersion, xscVersion, testCleanUp := integration.InitGitTest(t, services.MinXrayVersionGitRepoKey)
9895
defer testCleanUp()
9996

0 commit comments

Comments
 (0)