JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Style fix

Browse Source
This commit is contained in:
Eelco Dolstra 2013-08-01 14:56:19 +02:00
parent 7761b20411
commit 871126a9a9
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/partition.nix
View File

@ -137,7 +137,7 @@ in {
$machine->succeed("mountpoint $_[0]"); $machine->succeed("mountpoint $_[0]");
} }
sub remount_and_check { sub remountAndCheck {
$machine->nest("Remounting partitions:", sub { $machine->nest("Remounting partitions:", sub {
# XXX: "findmnt -ARunl -oTARGET /mnt" seems to NOT print all mounts! # XXX: "findmnt -ARunl -oTARGET /mnt" seems to NOT print all mounts!
my $getmounts_cmd = "cat /proc/mounts | cut -d' ' -f2 | grep '^/mnt'"; my $getmounts_cmd = "cat /proc/mounts | cut -d' ' -f2 | grep '^/mnt'";
@ -176,7 +176,7 @@ in {
ensurePartition("/dev/vdb4", "boot sector"); ensurePartition("/dev/vdb4", "boot sector");
ensureNoPartition("vdb6"); ensureNoPartition("vdb6");
ensureNoPartition("vdc1"); ensureNoPartition("vdc1");
remount_and_check; remountAndCheck;
ensureMountPoint("/mnt/boot"); ensureMountPoint("/mnt/boot");
ensureMountPoint("/mnt/nix"); ensureMountPoint("/mnt/nix");
}; };
@ -190,7 +190,7 @@ in {
ensurePartition("/dev/vdc2", "btrfs"); ensurePartition("/dev/vdc2", "btrfs");
ensureNoPartition("vdb3"); ensureNoPartition("vdb3");
ensureNoPartition("vdc3"); ensureNoPartition("vdc3");
remount_and_check; remountAndCheck;
}; };
parttest "RAID1 with XFS", sub { parttest "RAID1 with XFS", sub {
@ -202,7 +202,7 @@ in {
ensureNoPartition("vdb4"); ensureNoPartition("vdb4");
ensureNoPartition("vdc4"); ensureNoPartition("vdc4");
ensureNoPartition("md2"); ensureNoPartition("md2");
remount_and_check; remountAndCheck;
ensureMountPoint("/mnt/boot"); ensureMountPoint("/mnt/boot");
}; };
@ -219,7 +219,8 @@ in {
ensurePartition("/dev/nixos/boot", "ext3"); ensurePartition("/dev/nixos/boot", "ext3");
ensurePartition("/dev/nixos/swap", "swap"); ensurePartition("/dev/nixos/swap", "swap");
ensurePartition("/dev/nixos/root", "ext4"); ensurePartition("/dev/nixos/root", "ext4");
remount_and_check;
remountAndCheck;
ensureMountPoint("/mnt/boot"); ensureMountPoint("/mnt/boot");
}; };
''; '';