fix skip report error

jfrog · Jan 7, 2025 · 365c501 · 365c501
1 parent 62a39a4
commit 365c501
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/tests/utils/test_utils.go b/tests/utils/test_utils.go
@@ -59,13 +59,8 @@ func ValidateXrayVersion(t *testing.T, minVersion string) {
 	}
 }
 
-func ValidateXscVersion(t *testing.T, minVersion string) {
-	xscVersion, err := getTestsXscVersion()
-	if err != nil {
-		t.Skip(err)
-	}
-	err = clientUtils.ValidateMinimumVersion(clientUtils.Xsc, xscVersion.GetVersion(), minVersion)
-	if err != nil {
+func ValidateXscVersion(t *testing.T, xscVersion, minVersion string) {
+	if err := clientUtils.ValidateMinimumVersion(clientUtils.Xsc, xscVersion, minVersion); err != nil {
 		t.Skip(err)
 	}
 }
@@ -99,7 +94,7 @@ func GetTestsXrayVersion() (version.Version, error) {
 	return *version.NewVersion(xrayVersion), err
 }
 
-func getTestsXscVersion() (version.Version, error) {
+func getTestsDeprecatedXscVersion() (version.Version, error) {
 	xscVersion, err := configTests.XscAuth.GetVersion()
 	return *version.NewVersion(xscVersion), err
 }

diff --git a/xsc_test.go b/xsc_test.go
@@ -31,7 +31,8 @@ import (
 )
 
 func TestReportError(t *testing.T) {
-	xrayVersion, xscVersion, cleanUp := integration.InitXscTest(t, func() { securityTestUtils.ValidateXscVersion(t, xsc.MinXscVersionForErrorReport) })
+	xrayVersion, xscVersion, cleanUp := integration.InitXscTest(t)
+	securityTestUtils.ValidateXscVersion(t, xscVersion, xsc.MinXscVersionForErrorReport)
 	defer cleanUp()
 	errorToReport := errors.New("THIS IS NOT A REAL ERROR! This Error is posted as part of TestReportError test")
 	assert.NoError(t, xsc.ReportError(xrayVersion, xscVersion, tests.XscDetails, errorToReport, "cli"))