diff options
| author | aszlig <aszlig@nix.build> | 2018-11-02 10:18:51 +0100 |
|---|---|---|
| committer | aszlig <aszlig@nix.build> | 2018-11-02 10:23:04 +0100 |
| commit | 73cdd5a4762b3372634eed039912a0e25a5fd501 (patch) | |
| tree | c275750e2146b3ef900674b0bb4ad595fcdda4df /nixos | |
| parent | 5de50f8fa37147ec5905301d9dd576479441a736 (diff) | |
| download | nixlib-73cdd5a4762b3372634eed039912a0e25a5fd501.tar nixlib-73cdd5a4762b3372634eed039912a0e25a5fd501.tar.gz nixlib-73cdd5a4762b3372634eed039912a0e25a5fd501.tar.bz2 nixlib-73cdd5a4762b3372634eed039912a0e25a5fd501.tar.lz nixlib-73cdd5a4762b3372634eed039912a0e25a5fd501.tar.xz nixlib-73cdd5a4762b3372634eed039912a0e25a5fd501.tar.zst nixlib-73cdd5a4762b3372634eed039912a0e25a5fd501.zip | |
nixos/tests/chromium: Fix sandbox info matching
As reported by @andir, the regular expressions that match the sandbox output are no longer matching in the recent Chromium bump as of bb03fbc2c8b97ef5a4f4205eee51029155164b8a. Instead of a boolean field that determines whether namespace sandboxes are on, the namespace sandbox is now an enum within "Layer 1 Sandbox". I've modified the regular expressions accordingly and also ran the test for the stable branch, which now succeeds. Signed-off-by: aszlig <aszlig@nix.build> Issue: https://github.com/NixOS/nixpkgs/issues/49442 Cc: @bendlas, @andir
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/tests/chromium.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix index fcc55a59a216..e5097609fb27 100644 --- a/nixos/tests/chromium.nix +++ b/nixos/tests/chromium.nix @@ -168,7 +168,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec { my $clipboard = $machine->succeed(ru "${pkgs.xclip}/bin/xclip -o"); die "sandbox not working properly: $clipboard" - unless $clipboard =~ /namespace sandbox.*yes/mi + unless $clipboard =~ /layer 1 sandbox.*namespace/mi && $clipboard =~ /pid namespaces.*yes/mi && $clipboard =~ /network namespaces.*yes/mi && $clipboard =~ /seccomp.*sandbox.*yes/mi @@ -186,7 +186,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec { my $clipboard = $machine->succeed(ru "${pkgs.xclip}/bin/xclip -o"); die "copying twice in a row does not work properly: $clipboard" - unless $clipboard =~ /namespace sandbox.*yes/mi + unless $clipboard =~ /layer 1 sandbox.*namespace/mi && $clipboard =~ /pid namespaces.*yes/mi && $clipboard =~ /network namespaces.*yes/mi && $clipboard =~ /seccomp.*sandbox.*yes/mi |