From d24f103572bc7dd16f4ffa844cc6b315be603656 Mon Sep 17 00:00:00 2001 From: nukdokplex Date: Thu, 11 Sep 2025 00:01:53 +0500 Subject: [PATCH] lib.mkEUI64Suffix: fix syntax errors and tests --- lib/network/default.nix | 2 +- lib/tests/network.sh | 50 ++++++++++++++++++++--------------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/lib/network/default.nix b/lib/network/default.nix index 54934b138db0..822abc9abf53 100644 --- a/lib/network/default.nix +++ b/lib/network/default.nix @@ -85,7 +85,7 @@ in ( matches: if matches == null then - throw ''"${mac}" is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)'' + throw ''"${mac}" is not a valid MAC address (expected 6 octets of hex digits)'' else matches ) diff --git a/lib/tests/network.sh b/lib/tests/network.sh index e873ac851fe8..543a75c0f565 100755 --- a/lib/tests/network.sh +++ b/lib/tests/network.sh @@ -132,30 +132,30 @@ expectSuccess 'mkEUI64Suffix "ffffffffffff"' '"fdff:ffff:feff:ffff"' expectSuccess 'mkEUI64Suffix "00.00.00.00.00.00"' '"200:00ff:fe00:0000"' expectSuccess 'mkEUI64Suffix "000000000000"' '"200:00ff:fe00:0000"' -expectFailure 'mkEUI64Suffix "123456789AB"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "123456789A"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "123456789"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "12345678"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "1234567"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "123456"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "12345"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "1234"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "123"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "12"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "1"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix ""' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "------------"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "............"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "::::::::::::"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "1:2:3:4:5:6"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "0.0.0.0.0.0"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "00:11:-2:AA:BB:CC"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "00:-11:22:AA:BB:CC"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "ab:cd:ef:g0:12:34' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "AB:CD:EF:G0:12:34' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "ab:cd:ef:gh:jk:lm' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "AB:CD:EF:GH:JK:LM' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "01:23:3a:bc:de:fg"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" -expectFailure 'mkEUI64Suffix "01:23:3A:BC:DE:FG"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)" +expectFailure 'mkEUI64Suffix "123456789AB"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "123456789A"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "123456789"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "12345678"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "1234567"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "123456"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "12345"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "1234"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "123"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "12"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "1"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix ""' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "------------"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "............"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "::::::::::::"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "1:2:3:4:5:6"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "0.0.0.0.0.0"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "00:11:-2:AA:BB:CC"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "00:-11:22:AA:BB:CC"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "ab:cd:ef:g0:12:34"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "AB:CD:EF:G0:12:34"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "ab:cd:ef:gh:jk:lm"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "AB:CD:EF:GH:JK:LM"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "01:23:3a:bc:de:fg"' "is not a valid MAC address \(expected 6 octets of hex digits\)" +expectFailure 'mkEUI64Suffix "01:23:3A:BC:DE:FG"' "is not a valid MAC address \(expected 6 octets of hex digits\)" echo >&2 tests ok