mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
zoom-us: remove mesa dependency and questionable test
The NixOS test covers the same use case, but has a correctly set up, actually-graphical environment without the limitations of xvfb-run.
This commit is contained in:
parent
5bb24db2a7
commit
0c816328ae
3 changed files with 2 additions and 46 deletions
|
|
@ -14,5 +14,7 @@
|
|||
machine.wait_for_x()
|
||||
machine.execute("zoom >&2 &")
|
||||
machine.wait_for_window("Zoom Workplace")
|
||||
machine.sleep(20)
|
||||
machine.wait_for_window("Zoom Workplace")
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -135,7 +135,6 @@ let
|
|||
dontPatchELF = true;
|
||||
|
||||
passthru.updateScript = ./update.sh;
|
||||
passthru.tests.startwindow = callPackage ./test.nix { };
|
||||
passthru.tests.nixos-module = nixosTests.zoom-us;
|
||||
|
||||
meta = {
|
||||
|
|
@ -179,7 +178,6 @@ let
|
|||
pkgs.libxi
|
||||
pkgs.libxkbcommon
|
||||
pkgs.libxslt
|
||||
pkgs.mesa
|
||||
pkgs.mesa-demos
|
||||
pkgs.nspr
|
||||
pkgs.nss
|
||||
|
|
|
|||
|
|
@ -1,44 +0,0 @@
|
|||
{
|
||||
lib,
|
||||
xvfb-run,
|
||||
zoom-us,
|
||||
runCommand,
|
||||
writeShellApplication,
|
||||
xwininfo,
|
||||
}:
|
||||
|
||||
let
|
||||
testScript = writeShellApplication {
|
||||
name = "zoom-us-test-script";
|
||||
runtimeInputs = [
|
||||
xwininfo
|
||||
zoom-us
|
||||
];
|
||||
text = ''
|
||||
function is_zoom_window_present {
|
||||
echo
|
||||
xwininfo -root -tree \
|
||||
| sed 's/.*0x[0-9a-f]* \"\([^\"]*\)\".*/\1/; t; d' \
|
||||
| tee window-names
|
||||
grep -q "Zoom Workplace" window-names
|
||||
}
|
||||
# Don't let zoom eat all RAM, like it did, cf.
|
||||
# https://github.com/NixOS/nixpkgs/issues/371488
|
||||
prlimit --{as,data}=$((4*2**30)):$((4*2**30)) zoom-us &
|
||||
for _ in {0..900} ; do
|
||||
if is_zoom_window_present ; then
|
||||
break
|
||||
fi
|
||||
sleep 1
|
||||
done
|
||||
# If libraries are missing, the window still appears,
|
||||
# but then disappears again immediately; check for that also.
|
||||
sleep 20
|
||||
is_zoom_window_present
|
||||
'';
|
||||
};
|
||||
in
|
||||
runCommand "zoom-us-test" { buildInputs = [ xvfb-run ]; } ''
|
||||
HOME=$PWD xvfb-run ${lib.getExe testScript}
|
||||
touch ${placeholder "out"}
|
||||
''
|
||||
Loading…
Add table
Add a link
Reference in a new issue