Skip tests with no fix for X days (jfrog#533)

Author: attiasas

artifactory_test.go

@@ -23,7 +23,6 @@ import (
 	"github.com/jfrog/jfrog-cli-security/jas"
 	securityTests "github.com/jfrog/jfrog-cli-security/tests"
 	securityTestUtils "github.com/jfrog/jfrog-cli-security/tests/utils"
-	"github.com/jfrog/jfrog-cli-security/tests/utils/integration"
 	securityIntegrationTestUtils "github.com/jfrog/jfrog-cli-security/tests/utils/integration"
 	"github.com/jfrog/jfrog-cli-security/utils"
 	"github.com/jfrog/jfrog-cli-security/utils/artifactory"
@@ -49,6 +48,7 @@ func TestDependencyResolutionFromArtifactory(t *testing.T) {
 		resolveRepoName string
 		cacheRepoName   string
 		projectType     project.ProjectType
+		skipMsg         string
 	}{
 		{
 			testProjectPath: []string{"npm", "npm-no-lock"},
@@ -61,6 +61,7 @@ func TestDependencyResolutionFromArtifactory(t *testing.T) {
 			resolveRepoName: securityTests.NugetRemoteRepo,
 			cacheRepoName:   securityTests.NugetRemoteRepo,
 			projectType:     project.Dotnet,
+			skipMsg:         "Dotnet restore fails, pending fix XRAY-128186",
 		},
 		{
 			testProjectPath: []string{"yarn", "yarn-v2"},
@@ -85,6 +86,7 @@ func TestDependencyResolutionFromArtifactory(t *testing.T) {
 			resolveRepoName: securityTests.MvnVirtualRepo,
 			cacheRepoName:   securityTests.MvnRemoteRepo,
 			projectType:     project.Maven,
+			skipMsg:         "Snapshot repository is blocked by JPD, pending fix XRAY-124910",
 		},
 		{
 			testProjectPath: []string{"go", "simple-project"},
@@ -116,6 +118,9 @@ func TestDependencyResolutionFromArtifactory(t *testing.T) {
 
 	for _, testCase := range testCases {
 		t.Run(testCase.projectType.String(), func(t *testing.T) {
+			if testCase.skipMsg != "" {
+				securityTestUtils.SkipTestIfDurationNotPassed(t, "22-10-2025", 30, testCase.skipMsg)
+			}
 			testSingleTechDependencyResolution(t, testCase.testProjectPath, testCase.resolveRepoName, testCase.cacheRepoName, testCase.projectType)
 		})
 	}
@@ -289,7 +294,7 @@ func TestUploadCdxCmdCommand(t *testing.T) {
 	}
 	defer securityIntegrationTestUtils.ExecDeleteRepo(repoPath)
 	// Run the upload command
-	assert.NoError(t, integration.GetArtifactoryCli(cli.GetJfrogCliSecurityApp()).Exec("upload-cdx", "--rt-repo-path", repoPath, cdxFileToUpload))
+	assert.NoError(t, securityIntegrationTestUtils.GetArtifactoryCli(cli.GetJfrogCliSecurityApp()).Exec("upload-cdx", "--rt-repo-path", repoPath, cdxFileToUpload))
 
 	// Validate the file was uploaded successfully
 	searchResults, err := artifactory.SearchArtifactsInRepo(securityTests.RtDetails, filepath.Base(cdxFileToUpload), repoPath)

sca/bom/buildinfo/technologies/nuget/nuget_test.go

@@ -16,6 +16,8 @@ import (
 	"github.com/jfrog/build-info-go/entities"
 	"github.com/jfrog/jfrog-cli-core/v2/utils/tests"
 	"github.com/stretchr/testify/assert"
+
+	securityTestUtils "github.com/jfrog/jfrog-cli-security/tests/utils"
 )
 
 var testDataDir = filepath.Join("..", "..", "..", "..", "..", "tests", "testdata", "projects", "package-managers")
@@ -154,6 +156,7 @@ func TestSkipBuildDepTreeWhenInstallForbidden(t *testing.T) {
 		testDir                     string
 		installCommand              string
 		successfulTreeBuiltExpected bool
+		skipMsg                     string
 	}{
 		{
 			name:                        "nuget single 4.0  - installed | install not required",
@@ -164,6 +167,7 @@ func TestSkipBuildDepTreeWhenInstallForbidden(t *testing.T) {
 			name:                        "nuget single 5.0  - not installed | install required - install command",
 			testDir:                     filepath.Join("projects", "package-managers", "nuget", "single5.0"),
 			installCommand:              "nuget restore", // todo test in ci with nuget restore
+			skipMsg:                     "CI fails on 'dotnet restore' - MSBuild auto-detection: using msbuild version '' from '/opt/homebrew/bin', pending fix XRAY-128186",
 			successfulTreeBuiltExpected: true,
 		},
 		{
@@ -175,6 +179,7 @@ func TestSkipBuildDepTreeWhenInstallForbidden(t *testing.T) {
 			name:                        "nuget multi  - not installed | install required - install command",
 			testDir:                     filepath.Join("projects", "package-managers", "nuget", "multi"),
 			installCommand:              "nuget restore", // todo test in ci with nuget restore
+			skipMsg:                     "CI fails on 'dotnet restore' - MSBuild auto-detection: using msbuild version '' from '/opt/homebrew/bin', pending fix XRAY-128186",
 			successfulTreeBuiltExpected: true,
 		},
 		{
@@ -196,6 +201,9 @@ func TestSkipBuildDepTreeWhenInstallForbidden(t *testing.T) {
 
 	for _, test := range testCases {
 		t.Run(test.name, func(t *testing.T) {
+			if test.skipMsg != "" {
+				securityTestUtils.SkipTestIfDurationNotPassed(t, "22-10-2025", 30, test.skipMsg)
+			}
 			// Create and change directory to test workspace
 			_, cleanUp := technologies.CreateTestWorkspace(t, test.testDir)
 			defer cleanUp()

tests/consts.go

@@ -115,8 +115,18 @@ func getTestResourcesPath(basePath string) string {
 // Return local and remote repositories for the test suites, respectfully
 func GetNonVirtualRepositories() map[*string]string {
 	nonVirtualReposMap := map[*bool][]*string{
-		TestDockerScan:  {&DockerLocalRepo, &DockerRemoteRepo},
-		TestArtifactory: {&NpmRemoteRepo, &NugetRemoteRepo, &YarnRemoteRepo, &GradleRemoteRepo, &MvnRemoteRepo, &MvnRemoteSnapshotsRepo, &GoRepo, &GoRemoteRepo, &PypiRemoteRepo},
+		TestDockerScan: {&DockerLocalRepo, &DockerRemoteRepo},
+		TestArtifactory: {
+			&NpmRemoteRepo,
+			&NugetRemoteRepo,
+			&YarnRemoteRepo,
+			&GradleRemoteRepo,
+			&MvnRemoteRepo,
+			&MvnRemoteSnapshotsRepo,
+			&GoRepo,
+			&GoRemoteRepo,
+			&PypiRemoteRepo,
+		},
 	}
 	return getNeededRepositories(nonVirtualReposMap)
 }
@@ -149,7 +159,9 @@ func getNeededRepositories(reposMap map[*bool][]*string) map[*string]string {
 	for needed, testRepos := range reposMap {
 		if *needed {
 			for _, repo := range testRepos {
-				reposToCreate[repo] = reposConfigMap[repo]
+				if reposConfigMap[repo] != "" {
+					reposToCreate[repo] = reposConfigMap[repo]
+				}
 			}
 		}
 	}

tests/testdata/artifactory-repo-configs/maven_remote_snapshots_repository_config.json

@@ -2,5 +2,5 @@
   "key": "${MAVEN_REMOTE_SNAPSHOTS_REPO}",
   "rclass": "remote",
   "packageType": "maven",
-  "url": "https://repo.spring.io/snapshot"
+  "url": "https://repository.apache.org/snapshots"
 }

tests/utils/integration/test_integrationutils.go

@@ -104,6 +104,7 @@ func InitAuditNewScaTests(t *testing.T, minVersion string) {
 	if !*configTests.TestAuditNewSca {
 		t.Skip(getSkipTestMsg("Audit command new SCA integration", "--test.audit.NewSca"))
 	}
+	testUtils.SkipTestIfDurationNotPassed(t, "22-10-2025", 14, "Catalog API not available yet in test platform.")
 	testUtils.GetAndValidateXrayVersion(t, minVersion)
 }
 

tests/utils/test_utils.go

@@ -32,6 +32,25 @@ import (
 	clientTests "github.com/jfrog/jfrog-client-go/utils/tests"
 )
 
+// SkipTestIfDurationNotPassed skips the test if the specified duration in days hasn't passed since the given date.
+// dateStr should be in the format "02-01-2006" (DD-MM-YYYY).
+// durationDays is the number of days that should have passed.
+func SkipTestIfDurationNotPassed(t *testing.T, dateStr string, durationDays int, msg string) {
+	givenDate, err := time.Parse("02-01-2006", dateStr)
+	if err != nil {
+		t.Fatalf("Invalid date format '%s'. Expected format: DD-MM-YYYY", dateStr)
+	}
+
+	daysSinceDate := int(time.Since(givenDate).Hours() / 24)
+	if daysSinceDate < durationDays {
+		if msg == "" {
+			t.Skipf("Skipping test. Only %d days have passed since %s, but %d days are required.", daysSinceDate, dateStr, durationDays)
+		} else {
+			t.Skipf("Skipping test (%d/%d days have passed since %s, but %d days are required.) Reason: %s", daysSinceDate, durationDays, dateStr, durationDays, msg)
+		}
+	}
+}
+
 func UnmarshalJson(t *testing.T, output string) formats.EnrichJson {
 	var jsonMap formats.EnrichJson
 	err := json.Unmarshal([]byte(output), &jsonMap)