bib: make image_test.go follow the $pkg_test go pattern

osbuild · May 28, 2024 · 017c424 · 017c424
1 parent 95e8e12
commit 017c424
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/bib/cmd/bootc-image-builder/export_test.go b/bib/cmd/bootc-image-builder/export_test.go
@@ -1,6 +1,10 @@
 package main
 
-var CanChownInPath = canChownInPath
+var (
+	CanChownInPath                = canChownInPath
+	ApplyFilesystemCustomizations = applyFilesystemCustomizations
+	GetDistroAndRunner            = getDistroAndRunner
+)
 
 func MockOsGetuid(new func() int) (restore func()) {
 	saved := osGetuid

diff --git a/bib/cmd/bootc-image-builder/image_test.go b/bib/cmd/bootc-image-builder/image_test.go
@@ -1,14 +1,16 @@
-package main
+package main_test
 
 import (
 	"fmt"
 	"testing"
 
-	"github.com/osbuild/bootc-image-builder/bib/internal/source"
 	"github.com/osbuild/images/pkg/manifest"
 	"github.com/osbuild/images/pkg/runner"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	bib "github.com/osbuild/bootc-image-builder/bib/cmd/bootc-image-builder"
+	"github.com/osbuild/bootc-image-builder/bib/internal/source"
 )
 
 func TestGetDistroAndRunner(t *testing.T) {
@@ -42,7 +44,7 @@ func TestGetDistroAndRunner(t *testing.T) {
 				ID:        c.id,
 				VersionID: c.versionID,
 			}
-			distro, runner, err := getDistroAndRunner(osRelease)
+			distro, runner, err := bib.GetDistroAndRunner(osRelease)
 			if c.expectedErr != "" {
 				assert.ErrorContains(t, err, c.expectedErr)
 			} else {