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

disk: rename Partition.Filesystem to Payload

Browse source 
A Partition can contain any type of Entity now.  Before we change the
type, rename the field to a more generic term.
This commit is contained in:
Achilleas Koutsou 2022-02-08 14:50:50 +01:00 • committed by Tom Gundersen
parent 221cdedebc
commit 54fd090a60
16 changed files with 172 additions and 170 deletions
Download patch file Download diff file Expand all files Collapse all files

14
internal/disk/disk_test.go
View file

@ -51,7 +51,7 @@ func TestDisk_DynamicallyResizePartitionTable(t *testing.T) {
{
Type: FilesystemDataGUID,
UUID: RootPartitionUUID,
Filesystem: &Filesystem{
Payload: &Filesystem{
Type: "xfs",
Label: "root",
Mountpoint: "/",
@ -86,7 +86,7 @@ var canonicalPartitionTable = PartitionTable{
Size: 204800,
Type: EFISystemPartitionGUID,
UUID: EFISystemPartitionUUID,
Filesystem: &Filesystem{
Payload: &Filesystem{
Type: "vfat",
UUID: EFIFilesystemUUID,
Mountpoint: "/boot/efi",
@ -99,7 +99,7 @@ var canonicalPartitionTable = PartitionTable{
Size: 1048576,
Type: FilesystemDataGUID,
UUID: FilesystemDataUUID,
Filesystem: &Filesystem{
Payload: &Filesystem{
Type: "xfs",
Mountpoint: "/boot",
FSTabOptions: "defaults",
@ -110,7 +110,7 @@ var canonicalPartitionTable = PartitionTable{
{
Type: FilesystemDataGUID,
UUID: RootPartitionUUID,
Filesystem: &Filesystem{
Payload: &Filesystem{
Type: "xfs",
Label: "root",
Mountpoint: "/",
@ -123,9 +123,9 @@ var canonicalPartitionTable = PartitionTable{
}
func TestDisk_ForEachFilesystem(t *testing.T) {
rootFs := canonicalPartitionTable.Partitions[3].Filesystem
bootFs := canonicalPartitionTable.Partitions[2].Filesystem
efiFs := canonicalPartitionTable.Partitions[1].Filesystem
rootFs := canonicalPartitionTable.Partitions[3].Payload
bootFs := canonicalPartitionTable.Partitions[2].Payload
efiFs := canonicalPartitionTable.Partitions[1].Payload
// check we iterate in the correct order and throughout the whole array
var expectedFilesystems []*Filesystem