lol

nixosTests.morph-browser: Migrate to runTest

+44 -46
+1 -1
nixos/tests/all-tests.nix
··· 725 725 moodle = handleTest ./moodle.nix {}; 726 726 moonraker = handleTest ./moonraker.nix {}; 727 727 mopidy = handleTest ./mopidy.nix {}; 728 - morph-browser = handleTest ./morph-browser.nix { }; 728 + morph-browser = runTest ./morph-browser.nix; 729 729 morty = handleTest ./morty.nix {}; 730 730 mosquitto = handleTest ./mosquitto.nix {}; 731 731 moosefs = handleTest ./moosefs.nix {};
+43 -45
nixos/tests/morph-browser.nix
··· 1 - import ./make-test-python.nix ( 2 - { pkgs, lib, ... }: 3 - { 4 - name = "morph-browser-standalone"; 5 - meta.maintainers = lib.teams.lomiri.members; 1 + { pkgs, lib, ... }: 2 + { 3 + name = "morph-browser-standalone"; 4 + meta.maintainers = lib.teams.lomiri.members; 6 5 7 - nodes.machine = 8 - { config, pkgs, ... }: 9 - { 10 - imports = [ 11 - ./common/x11.nix 12 - ]; 6 + nodes.machine = 7 + { config, pkgs, ... }: 8 + { 9 + imports = [ 10 + ./common/x11.nix 11 + ]; 13 12 14 - services.xserver.enable = true; 13 + services.xserver.enable = true; 15 14 16 - environment = { 17 - systemPackages = with pkgs.lomiri; [ 18 - suru-icon-theme 19 - morph-browser 20 - ]; 21 - variables = { 22 - UITK_ICON_THEME = "suru"; 23 - }; 15 + environment = { 16 + systemPackages = with pkgs.lomiri; [ 17 + suru-icon-theme 18 + morph-browser 19 + ]; 20 + variables = { 21 + UITK_ICON_THEME = "suru"; 24 22 }; 23 + }; 25 24 26 - i18n.supportedLocales = [ "all" ]; 25 + i18n.supportedLocales = [ "all" ]; 27 26 28 - fonts.packages = with pkgs; [ 29 - # Intended font & helps with OCR 30 - ubuntu-classic 31 - ]; 32 - }; 27 + fonts.packages = with pkgs; [ 28 + # Intended font & helps with OCR 29 + ubuntu-classic 30 + ]; 31 + }; 33 32 34 - enableOCR = true; 33 + enableOCR = true; 35 34 36 - testScript = '' 37 - machine.wait_for_x() 35 + testScript = '' 36 + machine.wait_for_x() 38 37 39 - with subtest("morph browser launches"): 40 - machine.execute("morph-browser >&2 &") 41 - machine.wait_for_text(r"Web Browser|New|sites|Bookmarks") 42 - machine.screenshot("morph_open") 38 + with subtest("morph browser launches"): 39 + machine.execute("morph-browser >&2 &") 40 + machine.wait_for_text(r"Web Browser|New|sites|Bookmarks") 41 + machine.screenshot("morph_open") 43 42 44 - with subtest("morph browser displays HTML"): 45 - machine.send_chars("file://${pkgs.valgrind.doc}/share/doc/valgrind/html/index.html\n") 46 - machine.wait_for_text("Valgrind Documentation") 47 - machine.screenshot("morph_htmlcontent") 43 + with subtest("morph browser displays HTML"): 44 + machine.send_chars("file://${pkgs.valgrind.doc}/share/doc/valgrind/html/index.html\n") 45 + machine.wait_for_text("Valgrind Documentation") 46 + machine.screenshot("morph_htmlcontent") 48 47 49 - machine.succeed("pkill -f morph-browser") 48 + machine.succeed("pkill -f morph-browser") 50 49 51 - with subtest("morph browser localisation works"): 52 - machine.execute("env LANG=de_DE.UTF-8 morph-browser >&2 &") 53 - machine.wait_for_text(r"Web-Browser|Neuer|Seiten|Lesezeichen") 54 - machine.screenshot("morph_localised") 55 - ''; 56 - } 57 - ) 50 + with subtest("morph browser localisation works"): 51 + machine.execute("env LANG=de_DE.UTF-8 morph-browser >&2 &") 52 + machine.wait_for_text(r"Web-Browser|Neuer|Seiten|Lesezeichen") 53 + machine.screenshot("morph_localised") 54 + ''; 55 + }