Skip to content

Commit 285e1f1

Browse files
authored
integration: Fix filenames to not include the : char (fanal#79)
Signed-off-by: Simarpreet Singh <[email protected]>
1 parent d3979a0 commit 285e1f1

9 files changed

+7
-3
lines changed

integration/library_test.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ var testCases = []testCase{
100100
imageFile: "testdata/fixtures/vulnimage.tar.gz",
101101
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"},
102102
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",
105105
},
106106
}
107107

@@ -270,7 +270,11 @@ func checkPackageFromCommands(t *testing.T, actualFiles extractor.FileMap, osFou
270270
func checkPackages(actualFiles extractor.FileMap, t *testing.T, tc testCase) {
271271
actualPkgs, err := analyzer.GetPackages(actualFiles)
272272
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)
274278
var expectedPkgs []analyzer.Package
275279
json.Unmarshal(data, &expectedPkgs)
276280
assert.ElementsMatch(t, expectedPkgs, actualPkgs, tc.name)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)