From c07aa0c406f2c5df213bf760e3b95a7737fcaab4 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 19 Aug 2025 23:48:04 -0400 Subject: [PATCH] delete list-usb-drives test --- overlays.nix | 17 +-------------- tests/list-usb-drives.nix | 46 --------------------------------------- tests/tests.nix | 1 - 3 files changed, 1 insertion(+), 63 deletions(-) delete mode 100644 tests/list-usb-drives.nix diff --git a/overlays.nix b/overlays.nix index 4139094..6595e99 100644 --- a/overlays.nix +++ b/overlays.nix @@ -61,22 +61,7 @@ final: prev: { ]; text = '' - # Allow overriding the disk-by-id directory for testing - DISK_BY_ID_DIR="''${LIST_USB_DRIVES_DISK_DIR:-/dev/disk/by-id}" - - # Mock lsblk for testing - if [ -n "''${LIST_USB_DRIVES_TEST_MODE:-}" ]; then - lsblk() { - echo "''$LIST_USB_DRIVES_MOCK_DATA" | tr '|' '\n' | while IFS=: read -r pattern response; do - case "$(basename "$3")" in *"$pattern"*) echo "$response"; return ;; esac - done || echo "UNKNOWN_MODEL UNKNOWN_SERIAL" - } - fi - - # Scan for USB devices in the specified directory - if [ -d "$DISK_BY_ID_DIR" ]; then - find "$DISK_BY_ID_DIR" -name "usb*" | grep -v "part[0-9]\$" | while read -r drive; do lsblk -no model,serial "$drive" | head -n1 | tr -d '\n' | tr " " "_" && echo -e " $(echo \"$drive\" | cut -d':' -f2-)"; done | column -t --table-columns=DRIVE,BAY | sort -n -k 2 - fi + find "$DISK_BY_ID_DIR" -name "usb*" | grep -v "part[0-9]\$" | while read -r drive; do lsblk -no model,serial "$drive" | head -n1 | tr -d '\n' | tr " " "_" && echo -e " $(echo \"$drive\" | cut -d':' -f2-)"; done | column -t --table-columns=DRIVE,BAY | sort -n -k 2 ''; }; } diff --git a/tests/list-usb-drives.nix b/tests/list-usb-drives.nix deleted file mode 100644 index 7b9f4f1..0000000 --- a/tests/list-usb-drives.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - config, - lib, - pkgs, - inputs, - ... -}: -let - # Create pkgs with list-usb-drives overlay - testPkgs = import inputs.nixpkgs { - system = pkgs.system; - overlays = [ (import ../overlays.nix) ]; - }; -in -testPkgs.testers.runNixOSTest { - name = "list-usb-drives test"; - - nodes.machine = - { pkgs, ... }: - { - environment.systemPackages = [ - testPkgs.list-usb-drives - ]; - }; - - testScript = '' - start_all() - machine.wait_for_unit("multi-user.target") - - # Create mock USB device symlinks - machine.succeed("mkdir -p /tmp/mock-by-id") - machine.succeed("touch /tmp/mock-by-id/usb-drive1-0:0") - machine.succeed("touch /tmp/mock-by-id/usb-drive2-0:1") - machine.succeed("touch /tmp/mock-by-id/usb-drive1-0:0-part1") # Should be filtered out - - # Test with mock data - mock_data = "drive1:Model1 Serial1|drive2:Model2 Serial2" - output = machine.succeed(f"LIST_USB_DRIVES_DISK_DIR=/tmp/mock-by-id LIST_USB_DRIVES_TEST_MODE=1 LIST_USB_DRIVES_MOCK_DATA='{mock_data}' list-usb-drives") - - # Expected exact output - expected = 'DRIVE BAY\nModel1_Serial1 0"\nModel2_Serial2 1"\n' - - assert output == expected - print("✓ Mock USB device test passed") - ''; -} diff --git a/tests/tests.nix b/tests/tests.nix index 2b6f125..e2b6e5e 100644 --- a/tests/tests.nix +++ b/tests/tests.nix @@ -11,5 +11,4 @@ in zfsTest = handleTest ./zfs.nix; testTest = handleTest ./testTest.nix; minecraftTest = handleTest ./minecraft.nix; - listUsbDrivesTest = handleTest ./list-usb-drives.nix; }