nixosTests.signal-desktop: migrate to runTest

Part of #386873
This commit is contained in:
Piotr Kwiecinski 2025-04-19 18:17:50 +02:00
parent 43bdffa3ba
commit d7e7243d4c
No known key found for this signature in database
GPG key ID: EC0DE1CB9D5258B4
2 changed files with 71 additions and 74 deletions

View file

@ -1205,7 +1205,7 @@ in
shadowsocks = handleTest ./shadowsocks { }; shadowsocks = handleTest ./shadowsocks { };
shattered-pixel-dungeon = handleTest ./shattered-pixel-dungeon.nix { }; shattered-pixel-dungeon = handleTest ./shattered-pixel-dungeon.nix { };
shiori = handleTest ./shiori.nix { }; shiori = handleTest ./shiori.nix { };
signal-desktop = handleTest ./signal-desktop.nix { }; signal-desktop = runTest ./signal-desktop.nix;
silverbullet = handleTest ./silverbullet.nix { }; silverbullet = handleTest ./silverbullet.nix { };
simple = handleTest ./simple.nix { }; simple = handleTest ./simple.nix { };
sing-box = handleTest ./sing-box.nix { }; sing-box = handleTest ./sing-box.nix { };

View file

@ -1,82 +1,79 @@
import ./make-test-python.nix ( { pkgs, ... }:
{ pkgs, ... }: let
sqlcipher-signal = pkgs.writeShellScriptBin "sqlcipher" ''
set -eu
let readonly CFG=~/.config/Signal/config.json
sqlcipher-signal = pkgs.writeShellScriptBin "sqlcipher" '' readonly KEY="$(${pkgs.jq}/bin/jq --raw-output '.key' $CFG)"
set -eu readonly DB="$1"
readonly SQL="SELECT * FROM sqlite_master where type='table'"
${pkgs.sqlcipher}/bin/sqlcipher "$DB" "PRAGMA key = \"x'$KEY'\"; $SQL"
'';
in
{
name = "signal-desktop";
meta = with pkgs.lib.maintainers; {
maintainers = [
flokli
primeos
];
};
readonly CFG=~/.config/Signal/config.json nodes.machine =
readonly KEY="$(${pkgs.jq}/bin/jq --raw-output '.key' $CFG)" { ... }:
readonly DB="$1"
readonly SQL="SELECT * FROM sqlite_master where type='table'" {
${pkgs.sqlcipher}/bin/sqlcipher "$DB" "PRAGMA key = \"x'$KEY'\"; $SQL" imports = [
''; ./common/user-account.nix
in ./common/x11.nix
{ ];
name = "signal-desktop";
meta = with pkgs.lib.maintainers; { services.xserver.enable = true;
maintainers = [ test-support.displayManager.auto.user = "alice";
flokli environment.systemPackages = with pkgs; [
primeos signal-desktop
file
sqlite
sqlcipher-signal
]; ];
}; };
nodes.machine = enableOCR = true;
{ ... }:
{ testScript =
imports = [ { nodes, ... }:
./common/user-account.nix let
./common/x11.nix user = nodes.machine.config.users.users.alice;
]; in
''
start_all()
machine.wait_for_x()
services.xserver.enable = true; # start signal desktop
test-support.displayManager.auto.user = "alice"; machine.execute("su - alice -c signal-desktop >&2 &")
environment.systemPackages = with pkgs; [
signal-desktop
file
sqlite
sqlcipher-signal
];
};
enableOCR = true; # Wait for the Signal window to appear. Since usually the tests
# are run sandboxed and therefore with no internet, we can not wait
# for the message "Link your phone ...". Nor should we wait for
# the "Failed to connect to server" message, because when manually
# running this test it will be not sandboxed.
machine.wait_for_text("Signal")
machine.wait_for_text("File Edit View Window Help")
machine.screenshot("signal_desktop")
testScript = # Test if the database is encrypted to prevent these issues:
{ nodes, ... }: # - https://github.com/NixOS/nixpkgs/issues/108772
let # - https://github.com/NixOS/nixpkgs/pull/117555
user = nodes.machine.config.users.users.alice; print(machine.succeed("su - alice -c 'file ~/.config/Signal/sql/db.sqlite'"))
in machine.fail(
'' "su - alice -c 'file ~/.config/Signal/sql/db.sqlite' | grep -e SQLite -e database"
start_all() )
machine.wait_for_x() # Only SQLCipher should be able to read the encrypted DB:
machine.fail(
# start signal desktop "su - alice -c 'sqlite3 ~/.config/Signal/sql/db.sqlite .tables'"
machine.execute("su - alice -c signal-desktop >&2 &") )
print(machine.succeed(
# Wait for the Signal window to appear. Since usually the tests "su - alice -c 'sqlcipher ~/.config/Signal/sql/db.sqlite'"
# are run sandboxed and therefore with no internet, we can not wait ))
# for the message "Link your phone ...". Nor should we wait for '';
# the "Failed to connect to server" message, because when manually }
# running this test it will be not sandboxed.
machine.wait_for_text("Signal")
machine.wait_for_text("File Edit View Window Help")
machine.screenshot("signal_desktop")
# Test if the database is encrypted to prevent these issues:
# - https://github.com/NixOS/nixpkgs/issues/108772
# - https://github.com/NixOS/nixpkgs/pull/117555
print(machine.succeed("su - alice -c 'file ~/.config/Signal/sql/db.sqlite'"))
machine.fail(
"su - alice -c 'file ~/.config/Signal/sql/db.sqlite' | grep -e SQLite -e database"
)
# Only SQLCipher should be able to read the encrypted DB:
machine.fail(
"su - alice -c 'sqlite3 ~/.config/Signal/sql/db.sqlite .tables'"
)
print(machine.succeed(
"su - alice -c 'sqlcipher ~/.config/Signal/sql/db.sqlite'"
))
'';
}
)