Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Update tests to not fail on Mac M1's #1730

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 12, 2023
Merged

Update tests to not fail on Mac M1's #1730

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions syft/source/image_all_layers_resolver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package source

import (
"fmt"
"io"
"runtime"
"sort"
"testing"

Expand Down Expand Up @@ -689,6 +691,11 @@ func Test_imageAllLayersResolver_resolvesLinks(t *testing.T) {
func TestAllLayersResolver_AllLocations(t *testing.T) {
img := imagetest.GetFixtureImage(t, "docker-archive", "image-files-deleted")

arch := "x86_64"
if runtime.GOARCH == "arm64" {
arch = "aarch64"
}

resolver, err := newAllLayersResolver(img)
assert.NoError(t, err)

Expand Down Expand Up @@ -799,9 +806,9 @@ func TestAllLayersResolver_AllLocations(t *testing.T) {
"/lib/apk/db/triggers",
"/lib/apk/exec",
"/lib/firmware",
"/lib/ld-musl-x86_64.so.1",
fmt.Sprintf("/lib/ld-musl-%s.so.1", arch),
"/lib/libapk.so.3.12.0",
"/lib/libc.musl-x86_64.so.1",
fmt.Sprintf("/lib/libc.musl-%s.so.1", arch),
"/lib/libcrypto.so.3",
"/lib/libssl.so.3",
"/lib/libz.so.1",
Expand Down