oss/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft.git synced 2025-11-18 00:43:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: stop unit test switch on host arch (#2156)

Browse Source 
Now that the test fixture pins to a particular digest, there's no need
for platform specific architecture switches in this test.

Signed-off-by: Will Murphy <will.murphy@anchore.com>
This commit is contained in:
William Murphy 2023-09-20 11:45:13 -04:00 committed by GitHub
parent ba00f3328d
commit b8f52d570e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
syft/internal/fileresolver/container_image_all_layers_test.go
View File

@ -1,9 +1,7 @@
package fileresolver package fileresolver
import ( import (
"fmt"
"io" "io"
"runtime"
"sort" "sort"
"testing" "testing"
@ -523,11 +521,6 @@ func Test_imageAllLayersResolver_resolvesLinks(t *testing.T) {
func TestAllLayersResolver_AllLocations(t *testing.T) { func TestAllLayersResolver_AllLocations(t *testing.T) {
img := imagetest.GetFixtureImage(t, "docker-archive", "image-files-deleted") img := imagetest.GetFixtureImage(t, "docker-archive", "image-files-deleted")
arch := "x86_64"
if runtime.GOARCH == "arm64" {
arch = "aarch64"
}
resolver, err := NewFromContainerImageAllLayers(img) resolver, err := NewFromContainerImageAllLayers(img)
assert.NoError(t, err) assert.NoError(t, err)
@ -638,9 +631,9 @@ func TestAllLayersResolver_AllLocations(t *testing.T) {
"/lib/apk/db/triggers", "/lib/apk/db/triggers",
"/lib/apk/exec", "/lib/apk/exec",
"/lib/firmware", "/lib/firmware",
fmt.Sprintf("/lib/ld-musl-%s.so.1", arch), "/lib/ld-musl-x86_64.so.1",
"/lib/libapk.so.3.12.0", "/lib/libapk.so.3.12.0",
fmt.Sprintf("/lib/libc.musl-%s.so.1", arch), "/lib/libc.musl-x86_64.so.1",
"/lib/libcrypto.so.3", "/lib/libcrypto.so.3",
"/lib/libssl.so.3", "/lib/libssl.so.3",
"/lib/libz.so.1", "/lib/libz.so.1",