From 6c0ec527b98de827e4dcb868498409b8e2cee1f3 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 8 May 2021 23:46:07 +0200 Subject: [PATCH] nixos/tests/shadow: Fix linting errors Linter errors reported: 6:32 f-string is missing placeholders 7:26 f-string is missing placeholders 8:32 f-string is missing placeholders 30:32 f-string is missing placeholders 31:26 f-string is missing placeholders 32:32 f-string is missing placeholders 48:32 f-string is missing placeholders 49:26 f-string is missing placeholders 50:32 f-string is missing placeholders 76:32 f-string is missing placeholders 77:26 f-string is missing placeholders 78:32 f-string is missing placeholders Signed-off-by: aszlig --- nixos/tests/shadow.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/nixos/tests/shadow.nix b/nixos/tests/shadow.nix index c51961e1fc6..dd2a575b193 100644 --- a/nixos/tests/shadow.nix +++ b/nixos/tests/shadow.nix @@ -36,9 +36,9 @@ in import ./make-test-python.nix ({ pkgs, ... }: { with subtest("Normal login"): shadow.send_key("alt-f2") - shadow.wait_until_succeeds(f"[ $(fgconsole) = 2 ]") - shadow.wait_for_unit(f"getty@tty2.service") - shadow.wait_until_succeeds(f"pgrep -f 'agetty.*tty2'") + shadow.wait_until_succeeds("[ $(fgconsole) = 2 ]") + shadow.wait_for_unit("getty@tty2.service") + shadow.wait_until_succeeds("pgrep -f 'agetty.*tty2'") shadow.wait_until_tty_matches(2, "login: ") shadow.send_chars("emma\n") shadow.wait_until_tty_matches(2, "login: emma") @@ -60,9 +60,9 @@ in import ./make-test-python.nix ({ pkgs, ... }: { with subtest("Change password"): shadow.send_key("alt-f3") - shadow.wait_until_succeeds(f"[ $(fgconsole) = 3 ]") - shadow.wait_for_unit(f"getty@tty3.service") - shadow.wait_until_succeeds(f"pgrep -f 'agetty.*tty3'") + shadow.wait_until_succeeds("[ $(fgconsole) = 3 ]") + shadow.wait_for_unit("getty@tty3.service") + shadow.wait_until_succeeds("pgrep -f 'agetty.*tty3'") shadow.wait_until_tty_matches(3, "login: ") shadow.send_chars("emma\n") shadow.wait_until_tty_matches(3, "login: emma") @@ -78,9 +78,9 @@ in import ./make-test-python.nix ({ pkgs, ... }: { shadow.send_chars("${password3}\n") shadow.sleep(2) shadow.send_key("alt-f4") - shadow.wait_until_succeeds(f"[ $(fgconsole) = 4 ]") - shadow.wait_for_unit(f"getty@tty4.service") - shadow.wait_until_succeeds(f"pgrep -f 'agetty.*tty4'") + shadow.wait_until_succeeds("[ $(fgconsole) = 4 ]") + shadow.wait_for_unit("getty@tty4.service") + shadow.wait_until_succeeds("pgrep -f 'agetty.*tty4'") shadow.wait_until_tty_matches(4, "login: ") shadow.send_chars("emma\n") shadow.wait_until_tty_matches(4, "login: emma") @@ -106,9 +106,9 @@ in import ./make-test-python.nix ({ pkgs, ... }: { with subtest("nologin shell"): shadow.send_key("alt-f5") - shadow.wait_until_succeeds(f"[ $(fgconsole) = 5 ]") - shadow.wait_for_unit(f"getty@tty5.service") - shadow.wait_until_succeeds(f"pgrep -f 'agetty.*tty5'") + shadow.wait_until_succeeds("[ $(fgconsole) = 5 ]") + shadow.wait_for_unit("getty@tty5.service") + shadow.wait_until_succeeds("pgrep -f 'agetty.*tty5'") shadow.wait_until_tty_matches(5, "login: ") shadow.send_chars("layla\n") shadow.wait_until_tty_matches(5, "login: layla")