From 1fd9bc9a380bcaf1caa6b95e47129e67ccaea911 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 Mar 2025 23:01:01 +0100 Subject: [PATCH] nixosTests.yabar: migrate to runTest Part Of #386873 --- nixos/tests/all-tests.nix | 2 +- nixos/tests/yabar.nix | 49 ++++++++++++++++++--------------------- 2 files changed, 24 insertions(+), 27 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index e7261f0595b5..97c45e60c42c 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1298,7 +1298,7 @@ in { xss-lock = handleTest ./xss-lock.nix {}; xterm = handleTest ./xterm.nix {}; xxh = handleTest ./xxh.nix {}; - yabar = handleTest ./yabar.nix {}; + yabar = runTest ./yabar.nix; ydotool = handleTest ./ydotool.nix {}; yggdrasil = runTest ./yggdrasil.nix; your_spotify = runTest ./your_spotify.nix; diff --git a/nixos/tests/yabar.nix b/nixos/tests/yabar.nix index 1c844677abbd..13a207f74829 100644 --- a/nixos/tests/yabar.nix +++ b/nixos/tests/yabar.nix @@ -1,33 +1,30 @@ -import ./make-test-python.nix ( - { pkgs, lib, ... }: - { - name = "yabar"; - meta.maintainers = [ ]; +{ + name = "yabar"; + meta.maintainers = [ ]; - nodes.machine = { - imports = [ - ./common/x11.nix - ./common/user-account.nix - ]; + nodes.machine = { + imports = [ + ./common/x11.nix + ./common/user-account.nix + ]; - test-support.displayManager.auto.user = "bob"; + test-support.displayManager.auto.user = "bob"; - programs.yabar.enable = true; - programs.yabar.bars = { - top.indicators.date.exec = "YABAR_DATE"; - }; + programs.yabar.enable = true; + programs.yabar.bars = { + top.indicators.date.exec = "YABAR_DATE"; }; + }; - testScript = '' - machine.start() - machine.wait_for_x() + testScript = '' + machine.start() + machine.wait_for_x() - # confirm proper startup - machine.wait_for_unit("yabar.service", "bob") - machine.sleep(10) - machine.wait_for_unit("yabar.service", "bob") + # confirm proper startup + machine.wait_for_unit("yabar.service", "bob") + machine.sleep(10) + machine.wait_for_unit("yabar.service", "bob") - machine.screenshot("top_bar") - ''; - } -) + machine.screenshot("top_bar") + ''; +}