From e6853b0ff96a535bc7a293bcf57a0e25f71c1248 Mon Sep 17 00:00:00 2001 From: attiasas Date: Tue, 23 Jun 2026 15:32:23 +0300 Subject: [PATCH 1/2] Skip failing tests due to XRAY-138919 --- git_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/git_test.go b/git_test.go index 3b2e10e6c..58b47ffb0 100644 --- a/git_test.go +++ b/git_test.go @@ -136,9 +136,10 @@ func TestGitAuditSimpleJson(t *testing.T) { func TestGitAuditStaticScaSimpleJson(t *testing.T) { // XRAY-136444 will be fixed in 3.141.7 integration.InitAuditNewScaTests(t, "3.141.7") + securityTestUtils.SkipTestIfDurationNotPassed(t, "01-06-2026", 60, "Bug in Xray Server, should be fixed at XRAY-138919") if coreutils.IsWindows() { // On windows tests are failing due to the bug in Xray Server, should be fixed at XRAY-138079 - securityTestUtils.SkipTestIfDurationNotPassed(t, "09-04-2026", 60, "Bug in Xray Server, should be fixed at XRAY-138079") + securityTestUtils.SkipTestIfDurationNotPassed(t, "01-06-2026", 60, "Bug in Xray Server, should be fixed at XRAY-138079") } xrayVersion := integration.GetAndValidateXrayVersion(t, securityUtils.StaticScanMinVersion) From 45ab939637e66faf98dc3d83340ca9287d366782 Mon Sep 17 00:00:00 2001 From: attiasas Date: Tue, 23 Jun 2026 15:59:34 +0300 Subject: [PATCH 2/2] fix unit tests --- sca/bom/buildinfo/technologies/pnpm/pnpm_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sca/bom/buildinfo/technologies/pnpm/pnpm_test.go b/sca/bom/buildinfo/technologies/pnpm/pnpm_test.go index 0f7e16155..d867455c9 100644 --- a/sca/bom/buildinfo/technologies/pnpm/pnpm_test.go +++ b/sca/bom/buildinfo/technologies/pnpm/pnpm_test.go @@ -44,7 +44,7 @@ func TestBuildDependencyTreeLimitedDepth(t *testing.T) { name: "With transitive dependencies", treeDepth: "1", expectedUniqueDeps: []string{ - "npm://axios:1.18.0", + "npm://axios:1.18.1", "npm://balaganjs:1.0.0", "npm://yargs:13.3.0", "npm://zen-website:1.0.0", @@ -54,7 +54,7 @@ func TestBuildDependencyTreeLimitedDepth(t *testing.T) { Nodes: []*xrayUtils.GraphNode{ { Id: "npm://balaganjs:1.0.0", - Nodes: []*xrayUtils.GraphNode{{Id: "npm://axios:1.18.0"}, {Id: "npm://yargs:13.3.0"}}, + Nodes: []*xrayUtils.GraphNode{{Id: "npm://axios:1.18.1"}, {Id: "npm://yargs:13.3.0"}}, }, }, },