@@ -100,8 +100,8 @@ var testCases = []testCase{
100
100
imageFile : "testdata/fixtures/vulnimage.tar.gz" ,
101
101
expectedFiles : []string {"etc/os-release" , "node-app/package-lock.json" , "python-app/Pipfile.lock" , "ruby-app/Gemfile.lock" , "rust-app/Cargo.lock" , "/config" , "etc/alpine-release" , "lib/apk/db/installed" , "php-app/composer.lock" },
102
102
expectedOS : analyzer.OS {Name : "3.7.1" , Family : "alpine" },
103
- expectedLibraries : "testdata/goldens/knqyf263vuln-image:1 .2.3.expectedlibs.golden" ,
104
- expectedPkgsFromCmds : "testdata/goldens/knqyf263vuln-image:1 .2.3.expectedpkgsfromcmds.golden" ,
103
+ expectedLibraries : "testdata/goldens/knqyf263vuln-image1 .2.3.expectedlibs.golden" ,
104
+ expectedPkgsFromCmds : "testdata/goldens/knqyf263vuln-image1 .2.3.expectedpkgsfromcmds.golden" ,
105
105
},
106
106
}
107
107
@@ -270,7 +270,11 @@ func checkPackageFromCommands(t *testing.T, actualFiles extractor.FileMap, osFou
270
270
func checkPackages (actualFiles extractor.FileMap , t * testing.T , tc testCase ) {
271
271
actualPkgs , err := analyzer .GetPackages (actualFiles )
272
272
require .NoError (t , err )
273
- data , _ := ioutil .ReadFile (fmt .Sprintf ("testdata/goldens/%s.expectedpackages.golden" , strings .ReplaceAll (tc .imageName , "/" , "" )))
273
+
274
+ r := strings .NewReplacer ("/" , "" , ":" , "" )
275
+ goldenFile := fmt .Sprintf ("testdata/goldens/%s.expectedpackages.golden" , r .Replace (tc .imageName ))
276
+
277
+ data , _ := ioutil .ReadFile (goldenFile )
274
278
var expectedPkgs []analyzer.Package
275
279
json .Unmarshal (data , & expectedPkgs )
276
280
assert .ElementsMatch (t , expectedPkgs , actualPkgs , tc .name )
0 commit comments