Skip to content
This repository was archived by the owner on Jul 18, 2025. It is now read-only.

Commit 395a136

Browse files
authored
Merge pull request #9 from eunomie/fix-tests
Run all tests on PR and fix TestNodeDetector
2 parents 5d32054 + dc36275 commit 395a136

3 files changed

Lines changed: 13 additions & 7 deletions

File tree

.github/workflows/go.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ jobs:
2222
run: go build -v
2323

2424
- name: Test
25-
run: go test -v
25+
run: go test -v ./...

registry/save.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ func (c *ImageCache) StoreImage() error {
159159
defer func() {
160160
err := tempTarFile.Close()
161161
if err != nil {
162-
skill.Log.Errorf("unable to close temp file (%s): %w", tempTarFile.Name(), err)
162+
skill.Log.Errorf("unable to close temp file (%s): %v", tempTarFile.Name(), err)
163163
}
164164
}()
165165

@@ -170,7 +170,7 @@ func (c *ImageCache) StoreImage() error {
170170
defer func() {
171171
err := readCloser.Close()
172172
if err != nil {
173-
skill.Log.Errorf("unable to close temp file (%s): %w", tempTarFile.Name(), err)
173+
skill.Log.Errorf("unable to close temp file (%s): %v", tempTarFile.Name(), err)
174174
}
175175
}()
176176

sbom/detect/detect_test.go

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,15 @@ import (
2929

3030
func TestNodeDetector(t *testing.T) {
3131
cmd, _ := command.NewDockerCli()
32-
cmd.Initialize(flags.NewClientOptions())
32+
err := cmd.Initialize(flags.NewClientOptions())
33+
if err != nil {
34+
t.Fatal(err)
35+
}
3336
cache, _ := registry.SaveImage("atomist/skill@sha256:a691a1ccfa81ab7cc6b422a53bfb9bbcea4d78873426b0389eec8f554da9b0b8", cmd)
34-
cache.StoreImage()
37+
err = cache.StoreImage()
38+
if err != nil {
39+
t.Fatal(err)
40+
}
3541
lm := types.LayerMapping{
3642
ByDiffId: make(map[string]string),
3743
}
@@ -42,9 +48,9 @@ func TestNodeDetector(t *testing.T) {
4248
}
4349
src, _, err := source.New(i, nil, nil)
4450
if err != nil {
45-
t.Fail()
51+
t.Fatal(err)
4652
}
47-
packages := nodePackageDetector()([]types.Package{}, *src, lm)
53+
packages := nodePackageDetector()([]types.Package{}, src, &lm)
4854
if len(packages) != 1 {
4955
t.Errorf("Expected package missing")
5056
}

0 commit comments

Comments
 (0)