mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-01 18:44:07 +00:00
4f0dadbf38
After final improvements to the official formatter implementation,
this commit now performs the first treewide reformat of Nix files using it.
This is part of the implementation of RFC 166.
Only "inactive" files are reformatted, meaning only files that
aren't being touched by any PR with activity in the past 2 months.
This is to avoid conflicts for PRs that might soon be merged.
Later we can do a full treewide reformat to get the rest,
which should not cause as many conflicts.
A CI check has already been running for some time to ensure that new and
already-formatted files are formatted, so the files being reformatted here
should also stay formatted.
This commit was automatically created and can be verified using
nix-build a08b3a4d19.tar.gz \
--argstr baseRev b32a094368
result/bin/apply-formatting $NIXPKGS_PATH
61 lines
1.6 KiB
Nix
61 lines
1.6 KiB
Nix
{
|
|
system ? builtins.currentSystem,
|
|
config ? { },
|
|
pkgs ? import ../.. { inherit system config; },
|
|
}:
|
|
|
|
with import ../lib/testing-python.nix { inherit system pkgs; };
|
|
makeTest {
|
|
name = "tigervnc";
|
|
meta = with pkgs.lib.maintainers; {
|
|
maintainers = [ ];
|
|
};
|
|
|
|
nodes = {
|
|
server =
|
|
{ pkgs, ... }:
|
|
{
|
|
environment.systemPackages = with pkgs; [
|
|
tigervnc # for Xvnc
|
|
xorg.xwininfo
|
|
imagemagickBig # for display with working label: support
|
|
];
|
|
networking.firewall.allowedTCPPorts = [ 5901 ];
|
|
};
|
|
|
|
client =
|
|
{ pkgs, ... }:
|
|
{
|
|
imports = [ ./common/x11.nix ];
|
|
# for vncviewer
|
|
environment.systemPackages = [ pkgs.tigervnc ];
|
|
};
|
|
};
|
|
|
|
enableOCR = true;
|
|
|
|
testScript = ''
|
|
start_all()
|
|
|
|
for host in [server, client]:
|
|
host.succeed("echo foobar | vncpasswd -f > vncpasswd")
|
|
|
|
server.succeed("Xvnc -geometry 720x576 :1 -PasswordFile vncpasswd >&2 &")
|
|
server.wait_until_succeeds("nc -z localhost 5901", timeout=10)
|
|
server.succeed("DISPLAY=:1 xwininfo -root | grep 720x576")
|
|
server.execute("DISPLAY=:1 display -size 360x200 -font sans -gravity south label:'HELLO VNC' >&2 &")
|
|
|
|
client.wait_for_x()
|
|
client.execute("vncviewer server:1 -PasswordFile vncpasswd >&2 &")
|
|
client.wait_for_window(r"VNC")
|
|
client.screenshot("screenshot")
|
|
text = client.get_screen_text()
|
|
|
|
# Displayed text
|
|
assert 'HELLO VNC' in text
|
|
# Client window title
|
|
# get_screen_text can't get correct string from screenshot
|
|
# assert 'TigerVNC' in text
|
|
'';
|
|
}
|