mirror of
https://github.com/anchore/syft.git
synced 2025-11-18 00:43:20 +01:00
test: update erlang test to new generated format
Signed-off-by: Christopher Phillips <christopher.phillips@anchore.com>
This commit is contained in:
parent
2bf99715af
commit
9099b986e7
@ -723,7 +723,7 @@ func Test_Cataloger_DefaultClassifiers_PositiveCases(t *testing.T) {
|
|||||||
Version: "25.3.2.7",
|
Version: "25.3.2.7",
|
||||||
Type: "binary",
|
Type: "binary",
|
||||||
PURL: "pkg:generic/erlang@25.3.2.7",
|
PURL: "pkg:generic/erlang@25.3.2.7",
|
||||||
Locations: locations("erlexec"),
|
Locations: locations("erlexec-25.3.2.7-2224b3107551c409fb8da6d85eaa1ed730d088db438924c97d6e25851381dd28-91724-100/erlexec"),
|
||||||
Metadata: metadata("erlang-binary"),
|
Metadata: metadata("erlang-binary"),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
@ -913,14 +913,6 @@ func assertPackagesAreEqual(t *testing.T, expected pkg.Package, p pkg.Package) {
|
|||||||
matches = false
|
matches = false
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
if m1.Location.RealPath != "" && m1.Location.RealPath != m2.Location.RealPath {
|
|
||||||
matches = false
|
|
||||||
break
|
|
||||||
}
|
|
||||||
if m1.Location.AccessPath != "" && m1.Location.AccessPath != m2.Location.AccessPath {
|
|
||||||
matches = false
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
matches = false
|
matches = false
|
||||||
@ -941,8 +933,8 @@ func assertPackagesAreEqual(t *testing.T, expected pkg.Package, p pkg.Package) {
|
|||||||
cmp.Transformer("Locations", func(l file.LocationSet) []file.Location {
|
cmp.Transformer("Locations", func(l file.LocationSet) []file.Location {
|
||||||
return l.ToSlice()
|
return l.ToSlice()
|
||||||
}),
|
}),
|
||||||
cmpopts.IgnoreUnexported(pkg.Package{}, file.Location{}),
|
cmpopts.IgnoreUnexported(pkg.Package{}, file.Location{}, file.LocationData{}, pkg.LicenseSet{}),
|
||||||
cmpopts.IgnoreFields(pkg.Package{}, "CPEs", "FoundBy", "MetadataType", "Type"),
|
cmpopts.IgnoreFields(pkg.Package{}, "CPEs", "FoundBy", "Type", "Locations"),
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -288,7 +288,7 @@ var defaultClassifiers = []classifier{
|
|||||||
FileGlob: "**/erlexec",
|
FileGlob: "**/erlexec",
|
||||||
EvidenceMatcher: fileContentsVersionMatcher(
|
EvidenceMatcher: fileContentsVersionMatcher(
|
||||||
// <artificial>[NUL]/usr/local/src/otp-25.3.2.7/erts/
|
// <artificial>[NUL]/usr/local/src/otp-25.3.2.7/erts/
|
||||||
`(?m)\<artificial\>\x00/usr/local/src/otp-(?P<version>[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+?)/erts/`,
|
`(?m)/usr/local/src/otp-(?P<version>[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+?)/erts/`,
|
||||||
),
|
),
|
||||||
Package: "erlang",
|
Package: "erlang",
|
||||||
PURL: mustPURL("pkg:generic/erlang@version"),
|
PURL: mustPURL("pkg:generic/erlang@version"),
|
||||||
|
|||||||
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user