From 6d14bac04845951be7d7231cd33edd8d47545635 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 13 Mar 2020 01:03:31 +0100 Subject: [PATCH] nixos/python-test-driver: allow single char as hostName and fix misleading error-message In case of invalid chars, the error-message references "perl variables" which is not the case here as the python-based framework is used. --- nixos/lib/testing-python.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index 6663864f1e56..3891adc10435 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -175,13 +175,13 @@ in rec { nodeNames = builtins.attrNames nodes; invalidNodeNames = lib.filter - (node: builtins.match "^[A-z_][A-z0-9_]+$" node == null) nodeNames; + (node: builtins.match "^[A-z_]([A-z0-9_]+)?$" node == null) nodeNames; in if lib.length invalidNodeNames > 0 then throw '' Cannot create machines out of (${lib.concatStringsSep ", " invalidNodeNames})! - All machines are referenced as perl variables in the testing framework which will break the + All machines are referenced as python variables in the testing framework which will break the script when special characters are used. Please stick to alphanumeric chars and underscores as separation.