Skip to content

Commit 8c92eac

Browse files
committed
fix conan tests
1 parent a72d854 commit 8c92eac

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

sca/bom/buildinfo/technologies/conan/conan_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ var expectedResult = &xrayUtils.GraphNode{
1818
Nodes: []*xrayUtils.GraphNode{
1919
{Id: "conan://zlib:1.3.1"},
2020
{Id: "conan://openssl:3.0.9", Nodes: []*xrayUtils.GraphNode{{Id: "conan://zlib:1.3.1"}}},
21-
{Id: "conan://meson:1.4.1", Nodes: []*xrayUtils.GraphNode{{Id: "conan://ninja:1.13.1"}}},
21+
{Id: "conan://meson:1.4.1", Nodes: []*xrayUtils.GraphNode{{Id: "conan://ninja:1.13.2"}}},
2222
},
2323
}
24-
var expectedUniqueDeps = []string{"conan://openssl:3.0.9", "conan://zlib:1.3.1", "conan://meson:1.4.1", "conan://ninja:1.13.1"}
24+
var expectedUniqueDeps = []string{"conan://openssl:3.0.9", "conan://zlib:1.3.1", "conan://meson:1.4.1", "conan://ninja:1.13.2"}
2525

2626
func TestParseConanDependencyTree(t *testing.T) {
2727
_, cleanUp := technologies.CreateTestWorkspace(t, filepath.Join("other", "conan"))
@@ -58,7 +58,7 @@ func TestCalculateUniqueDeps(t *testing.T) {
5858
"1": {Name: "zlib", Version: "1.3.1"},
5959
"2": {Name: "openssl", Version: "3.0.9"},
6060
"3": {Name: "meson", Version: "1.4.1"},
61-
"4": {Name: "ninja", Version: "1.13.1"},
61+
"4": {Name: "ninja", Version: "1.13.2"},
6262
"5": {Name: "openssl", Version: "3.0.9"}, // duplicate, should be removed
6363
}
6464

tests/testdata/other/conan/dependencies.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@
145145
"visible": true
146146
},
147147
"4": {
148-
"ref": "ninja/1.13.1",
149-
"require": "ninja/1.13.1",
148+
"ref": "ninja/1.13.2",
149+
"require": "ninja/1.13.2",
150150
"run": true,
151151
"libs": false,
152152
"skip": false,
@@ -965,7 +965,7 @@
965965
},
966966
"dependencies": {
967967
"4": {
968-
"ref": "ninja/1.13.1",
968+
"ref": "ninja/1.13.2",
969969
"require": "ninja/[>=1.10.2 <2]",
970970
"run": true,
971971
"libs": false,
@@ -985,7 +985,7 @@
985985
"test": false
986986
},
987987
"4": {
988-
"ref": "ninja/1.13.1#294f8721dbcde145674f7ba44994700e",
988+
"ref": "ninja/1.13.2#294f8721dbcde145674f7ba44994700e",
989989
"id": "4",
990990
"recipe": "Downloaded",
991991
"package_id": "3593751651824fb813502c69c971267624ced41a",
@@ -1016,7 +1016,7 @@
10161016
"win_bash_run": null,
10171017
"default_options": null,
10181018
"options_description": null,
1019-
"version": "1.13.1",
1019+
"version": "1.13.2",
10201020
"topics": [
10211021
"ninja",
10221022
"build"
@@ -1079,7 +1079,7 @@
10791079
}
10801080
},
10811081
"conf_info": {},
1082-
"label": "ninja/1.13.1",
1082+
"label": "ninja/1.13.2",
10831083
"info": {
10841084
"settings": {
10851085
"os": "Linux",
@@ -1090,9 +1090,9 @@
10901090
"vendor": false,
10911091
"conandata": {
10921092
"sources": {
1093-
"1.13.1": {
1093+
"1.13.2": {
10941094
"sha256": "f0055ad0369bf2e372955ba55128d000cfcc21777057806015b45e4accbebf23",
1095-
"url": "https://github.com/ninja-build/ninja/archive/v1.13.1.tar.gz"
1095+
"url": "https://github.com/ninja-build/ninja/archive/v1.13.2.tar.gz"
10961096
}
10971097
}
10981098
},
@@ -1106,7 +1106,7 @@
11061106
},
11071107
"overrides": {},
11081108
"resolved_ranges": {
1109-
"ninja/[>=1.10.2 <2]": "ninja/1.13.1"
1109+
"ninja/[>=1.10.2 <2]": "ninja/1.13.2"
11101110
},
11111111
"replaced_requires": {},
11121112
"error": null

0 commit comments

Comments
 (0)