nixosTests.bcachefs: migrate to runTest

Part of #386873

Changed files
+36 -38
nixos
+1 -1
nixos/tests/all-tests.nix
···
ayatana-indicators = runTest ./ayatana-indicators.nix;
babeld = runTest ./babeld.nix;
bazarr = runTest ./bazarr.nix;
-
bcachefs = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./bcachefs.nix { };
+
bcachefs = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./bcachefs.nix;
beanstalkd = handleTest ./beanstalkd.nix { };
bees = handleTest ./bees.nix { };
benchexec = handleTest ./benchexec.nix { };
+35 -37
nixos/tests/bcachefs.nix
···
-
import ./make-test-python.nix (
-
{ pkgs, ... }:
-
{
-
name = "bcachefs";
-
meta.maintainers = with pkgs.lib.maintainers; [ Madouura ];
+
{ pkgs, ... }:
+
{
+
name = "bcachefs";
+
meta.maintainers = with pkgs.lib.maintainers; [ Madouura ];
-
nodes.machine =
-
{ pkgs, ... }:
-
{
-
virtualisation.emptyDiskImages = [ 4096 ];
-
networking.hostId = "deadbeef";
-
boot.supportedFilesystems = [ "bcachefs" ];
-
environment.systemPackages = with pkgs; [
-
parted
-
keyutils
-
];
-
};
+
nodes.machine =
+
{ pkgs, ... }:
+
{
+
virtualisation.emptyDiskImages = [ 4096 ];
+
networking.hostId = "deadbeef";
+
boot.supportedFilesystems = [ "bcachefs" ];
+
environment.systemPackages = with pkgs; [
+
parted
+
keyutils
+
];
+
};
-
testScript = ''
-
machine.succeed("modprobe bcachefs")
-
machine.succeed("bcachefs version")
-
machine.succeed("ls /dev")
+
testScript = ''
+
machine.succeed("modprobe bcachefs")
+
machine.succeed("bcachefs version")
+
machine.succeed("ls /dev")
-
machine.succeed(
-
"mkdir /tmp/mnt",
-
"udevadm settle",
-
"parted --script /dev/vdb mklabel msdos",
-
"parted --script /dev/vdb -- mkpart primary 1024M 50% mkpart primary 50% -1s",
-
"udevadm settle",
-
"echo password | bcachefs format --encrypted --metadata_replicas 2 --label vtest /dev/vdb1 /dev/vdb2",
-
"echo password | bcachefs unlock -k session /dev/vdb1",
-
"echo password | mount -t bcachefs /dev/vdb1:/dev/vdb2 /tmp/mnt",
-
"udevadm settle",
-
"bcachefs fs usage /tmp/mnt",
-
"umount /tmp/mnt",
-
"udevadm settle",
-
)
-
'';
-
}
-
)
+
machine.succeed(
+
"mkdir /tmp/mnt",
+
"udevadm settle",
+
"parted --script /dev/vdb mklabel msdos",
+
"parted --script /dev/vdb -- mkpart primary 1024M 50% mkpart primary 50% -1s",
+
"udevadm settle",
+
"echo password | bcachefs format --encrypted --metadata_replicas 2 --label vtest /dev/vdb1 /dev/vdb2",
+
"echo password | bcachefs unlock -k session /dev/vdb1",
+
"echo password | mount -t bcachefs /dev/vdb1:/dev/vdb2 /tmp/mnt",
+
"udevadm settle",
+
"bcachefs fs usage /tmp/mnt",
+
"umount /tmp/mnt",
+
"udevadm settle",
+
)
+
'';
+
}