lol

nixosTests.yabar: migrate to runTest

Part Of #386873

+24 -27
+1 -1
nixos/tests/all-tests.nix
··· 1298 1298 xss-lock = handleTest ./xss-lock.nix {}; 1299 1299 xterm = handleTest ./xterm.nix {}; 1300 1300 xxh = handleTest ./xxh.nix {}; 1301 - yabar = handleTest ./yabar.nix {}; 1301 + yabar = runTest ./yabar.nix; 1302 1302 ydotool = handleTest ./ydotool.nix {}; 1303 1303 yggdrasil = runTest ./yggdrasil.nix; 1304 1304 your_spotify = runTest ./your_spotify.nix;
+23 -26
nixos/tests/yabar.nix
··· 1 - import ./make-test-python.nix ( 2 - { pkgs, lib, ... }: 3 - { 4 - name = "yabar"; 5 - meta.maintainers = [ ]; 1 + { 2 + name = "yabar"; 3 + meta.maintainers = [ ]; 6 4 7 - nodes.machine = { 8 - imports = [ 9 - ./common/x11.nix 10 - ./common/user-account.nix 11 - ]; 5 + nodes.machine = { 6 + imports = [ 7 + ./common/x11.nix 8 + ./common/user-account.nix 9 + ]; 12 10 13 - test-support.displayManager.auto.user = "bob"; 11 + test-support.displayManager.auto.user = "bob"; 14 12 15 - programs.yabar.enable = true; 16 - programs.yabar.bars = { 17 - top.indicators.date.exec = "YABAR_DATE"; 18 - }; 13 + programs.yabar.enable = true; 14 + programs.yabar.bars = { 15 + top.indicators.date.exec = "YABAR_DATE"; 19 16 }; 17 + }; 20 18 21 - testScript = '' 22 - machine.start() 23 - machine.wait_for_x() 19 + testScript = '' 20 + machine.start() 21 + machine.wait_for_x() 24 22 25 - # confirm proper startup 26 - machine.wait_for_unit("yabar.service", "bob") 27 - machine.sleep(10) 28 - machine.wait_for_unit("yabar.service", "bob") 23 + # confirm proper startup 24 + machine.wait_for_unit("yabar.service", "bob") 25 + machine.sleep(10) 26 + machine.wait_for_unit("yabar.service", "bob") 29 27 30 - machine.screenshot("top_bar") 31 - ''; 32 - } 33 - ) 28 + machine.screenshot("top_bar") 29 + ''; 30 + }