From 0492f44ab930f22baacbc4cc81f0f06bcc070ed8 Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Wed, 16 Apr 2025 14:12:28 +0200 Subject: [PATCH] nixosTests.obs-studio: migrate to runTest Part of #386873 --- nixos/tests/all-tests.nix | 2 +- nixos/tests/obs-studio.nix | 64 ++++++++++++++++++-------------------- 2 files changed, 32 insertions(+), 34 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 8e83095a7ded..123f233f7aca 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -965,7 +965,7 @@ in nzbhydra2 = handleTest ./nzbhydra2.nix { }; ocis = handleTest ./ocis.nix { }; oddjobd = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./oddjobd.nix { }; - obs-studio = handleTest ./obs-studio.nix { }; + obs-studio = runTest ./obs-studio.nix; oh-my-zsh = handleTest ./oh-my-zsh.nix { }; ollama = runTest ./ollama.nix; ollama-cuda = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./ollama-cuda.nix; diff --git a/nixos/tests/obs-studio.nix b/nixos/tests/obs-studio.nix index a1b5bacf0428..7290119a12d7 100644 --- a/nixos/tests/obs-studio.nix +++ b/nixos/tests/obs-studio.nix @@ -1,40 +1,38 @@ -import ./make-test-python.nix ( - { ... }: +{ ... }: - { - name = "obs-studio"; +{ + name = "obs-studio"; - nodes.machine = - { pkgs, ... }: - { - imports = [ - ./common/x11.nix - ./common/user-account.nix + nodes.machine = + { pkgs, ... }: + { + imports = [ + ./common/x11.nix + ./common/user-account.nix + ]; + + programs.obs-studio = { + enable = true; + plugins = with pkgs.obs-studio-plugins; [ + wlrobs + obs-vkcapture ]; - - programs.obs-studio = { - enable = true; - plugins = with pkgs.obs-studio-plugins; [ - wlrobs - obs-vkcapture - ]; - enableVirtualCamera = true; - }; + enableVirtualCamera = true; }; + }; - testScript = '' - machine.wait_for_x() - machine.succeed("obs --version") + testScript = '' + machine.wait_for_x() + machine.succeed("obs --version") - # virtual camera tests - machine.succeed("lsmod | grep v4l2loopback") - machine.succeed("ls /dev/video1") - machine.succeed("obs --startvirtualcam >&2 &") - machine.wait_for_window("OBS") - machine.sleep(5) + # virtual camera tests + machine.succeed("lsmod | grep v4l2loopback") + machine.succeed("ls /dev/video1") + machine.succeed("obs --startvirtualcam >&2 &") + machine.wait_for_window("OBS") + machine.sleep(5) - # test plugins - machine.succeed("which obs-vkcapture") - ''; - } -) + # test plugins + machine.succeed("which obs-vkcapture") + ''; +}