particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

distro: use PartitionTable.ContainsMountpoint

Browse source 
Use the new helper instead of re-defining it in the distro tests.
This commit is contained in:
Christian Kellner 2021-11-10 18:47:25 +01:00 • committed by Tom Gundersen
parent 4f474f1661
commit 2280a55e71
2 changed files with 4 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

19
internal/distro/rhel85/distro_internal_test.go
View file

@ -5,7 +5,6 @@ import (
"testing" "testing"
"github.com/osbuild/osbuild-composer/internal/blueprint" "github.com/osbuild/osbuild-composer/internal/blueprint"
"github.com/osbuild/osbuild-composer/internal/disk"
"github.com/osbuild/osbuild-composer/internal/distro" "github.com/osbuild/osbuild-composer/internal/distro"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
@ -32,18 +31,6 @@ var mountpoints = []blueprint.FilesystemCustomization{
/* #nosec G404 */ /* #nosec G404 */
var rng = rand.New(rand.NewSource(0)) var rng = rand.New(rand.NewSource(0))
func containsMountpoint(expected []disk.Partition, mountpoint string) bool {
for _, p := range expected {
if p.Filesystem == nil {
continue
}
if p.Filesystem.Mountpoint == mountpoint {
return true
}
}
return false
}
func TestDistro_UnsupportedArch(t *testing.T) { func TestDistro_UnsupportedArch(t *testing.T) {
testBasicImageType.arch = &architecture{ testBasicImageType.arch = &architecture{
name: "unsupported_arch", name: "unsupported_arch",
@ -61,8 +48,7 @@ func TestDistro_DefaultPartitionTables(t *testing.T) {
pt, err := testBasicImageType.getPartitionTable(mountpoints, distro.ImageOptions{}, rng) pt, err := testBasicImageType.getPartitionTable(mountpoints, distro.ImageOptions{}, rng)
require.Nil(t, err) require.Nil(t, err)
for _, m := range mountpoints { for _, m := range mountpoints {
contains := containsMountpoint(pt.Partitions, m.Mountpoint) assert.True(t, pt.ContainsMountpoint(m.Mountpoint))
assert.True(t, contains)
} }
} }
} }
@ -77,8 +63,7 @@ func TestDistro_Ec2PartitionTables(t *testing.T) {
if _, exists := testEc2ImageType.basePartitionTables[archName]; exists { if _, exists := testEc2ImageType.basePartitionTables[archName]; exists {
require.Nil(t, err) require.Nil(t, err)
for _, m := range mountpoints { for _, m := range mountpoints {
contains := containsMountpoint(pt.Partitions, m.Mountpoint) assert.True(t, pt.ContainsMountpoint(m.Mountpoint))
assert.True(t, contains)
} }
} else { } else {
require.EqualError(t, err, "unknown arch: "+testEc2ImageType.arch.name) require.EqualError(t, err, "unknown arch: "+testEc2ImageType.arch.name)

19
internal/distro/rhel86/distro_internal_test.go
View file

@ -5,7 +5,6 @@ import (
"testing" "testing"
"github.com/osbuild/osbuild-composer/internal/blueprint" "github.com/osbuild/osbuild-composer/internal/blueprint"
"github.com/osbuild/osbuild-composer/internal/disk"
"github.com/osbuild/osbuild-composer/internal/distro" "github.com/osbuild/osbuild-composer/internal/distro"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
@ -32,18 +31,6 @@ var mountpoints = []blueprint.FilesystemCustomization{
/* #nosec G404 */ /* #nosec G404 */
var rng = rand.New(rand.NewSource(0)) var rng = rand.New(rand.NewSource(0))
func containsMountpoint(expected []disk.Partition, mountpoint string) bool {
for _, p := range expected {
if p.Filesystem == nil {
continue
}
if p.Filesystem.Mountpoint == mountpoint {
return true
}
}
return false
}
func TestDistro_UnsupportedArch(t *testing.T) { func TestDistro_UnsupportedArch(t *testing.T) {
testBasicImageType.arch = &architecture{ testBasicImageType.arch = &architecture{
name: "unsupported_arch", name: "unsupported_arch",
@ -61,8 +48,7 @@ func TestDistro_DefaultPartitionTables(t *testing.T) {
pt, err := testBasicImageType.getPartitionTable(mountpoints, distro.ImageOptions{}, rng) pt, err := testBasicImageType.getPartitionTable(mountpoints, distro.ImageOptions{}, rng)
require.Nil(t, err) require.Nil(t, err)
for _, m := range mountpoints { for _, m := range mountpoints {
contains := containsMountpoint(pt.Partitions, m.Mountpoint) assert.True(t, pt.ContainsMountpoint(m.Mountpoint))
assert.True(t, contains)
} }
} }
} }
@ -77,8 +63,7 @@ func TestDistro_Ec2PartitionTables(t *testing.T) {
if _, exists := testEc2ImageType.basePartitionTables[archName]; exists { if _, exists := testEc2ImageType.basePartitionTables[archName]; exists {
require.Nil(t, err) require.Nil(t, err)
for _, m := range mountpoints { for _, m := range mountpoints {
contains := containsMountpoint(pt.Partitions, m.Mountpoint) assert.True(t, pt.ContainsMountpoint(m.Mountpoint))
assert.True(t, contains)
} }
} else { } else {
require.EqualError(t, err, "unknown arch: "+testEc2ImageType.arch.name) require.EqualError(t, err, "unknown arch: "+testEc2ImageType.arch.name)