commit e45c211b50c6f473e3d92d29e1a8426ec4579f05 · pyrox.dev/nixpkgs

+1 -1

nixos/release-combined.nix

···

       48
       48
        
               (all nixos.ova)

     

       49
       49
        
       

     

       50
       50
        
               #(all nixos.tests.containers)

     

       51
       51
       -
               (all nixos.tests.chromium)

     

       51
       51
       +
               (all nixos.tests.chromium.stable)

     

       52
       52
        
               (all nixos.tests.firefox)

     

       53
       53
        
               (all nixos.tests.firewall)

     

       54
       54
        
               nixos.tests.gnome3.x86_64-linux # FIXME: i686-linux

+1 -1

nixos/release.nix

···

       235
       235
        
         tests.blivet = callTest tests/blivet.nix {};

     

       236
       236
        
         tests.boot = callSubTests tests/boot.nix {};

     

       237
       237
        
         tests.cadvisor = hydraJob (import tests/cadvisor.nix { system = "x86_64-linux"; });

     

       238
       238
       -
         tests.chromium = callTest tests/chromium.nix {};

     

       238
       238
       +
         tests.chromium = callSubTests tests/chromium.nix {};

     

       239
       239
        
         tests.cjdns = callTest tests/cjdns.nix {};

     

       240
       240
        
         tests.containers = callTest tests/containers.nix {};

     

       241
       241
        
         tests.docker = hydraJob (import tests/docker.nix { system = "x86_64-linux"; });

+60 -71

nixos/tests/chromium.nix

···

       1
       1
       -
       import ./make-test.nix (

     

       2
       2
       -
       { pkgs

     

       3
       3
       -
       , channelMap ? {

     

       4
       4
       -
           stable = pkgs.chromium;

     

       5
       5
       -
           #beta   = pkgs.chromiumBeta;

     

       6
       6
       -
           #dev    = pkgs.chromiumDev;

     

       7
       7
       -
         }

     

       8
       8
       -
       , ...

     

       9
       9
       -
       }: rec {

     

       10
       10
       -
         name = "chromium";

     

       1
       1
       +
       { system ? builtins.currentSystem }:

     

       2
       2
       +
       

     

       3
       3
       +
       with import ../lib/testing.nix { inherit system; };

     

       4
       4
       +
       with pkgs.lib;

     

       5
       5
       +
       

     

       6
       6
       +
       mapAttrs (channel: chromiumPkg: makeTest rec {

     

       7
       7
       +
         name = "chromium-${channel}";

     

       11
       8
        
         meta = with pkgs.stdenv.lib.maintainers; {

     

       12
       9
        
           maintainers = [ aszlig ];

     

       13
       10
        
         };

     
···

       16
       13
        
       

     

       17
       14
        
         machine.imports = [ ./common/x11.nix ];

     

       18
       15
        
         machine.virtualisation.memorySize = 2047;

     

       16
       16
       +
         machine.environment.systemPackages = [ chromiumPkg ];

     

       19
       17
        
       

     

       20
       18
        
         startupHTML = pkgs.writeText "chromium-startup.html" ''

     

       21
       19
        
           <!DOCTYPE html>

     
···

       105
       103
        
             closeWin;

     

       106
       104
        
           }

     

       107
       105
        
       

     

       108
       108
       -
           sub chromiumTest {

     

       109
       109
       -
             my ($channel, $pkg, $code) = @_;

     

       110
       110
       -
             $machine->waitForX;

     

       106
       106
       +
           $machine->waitForX;

     

       111
       107
        
       

     

       112
       112
       -
             my $url = "file://${startupHTML}";

     

       113
       113
       -
             my $args = "--user-data-dir=/tmp/chromium-$channel";

     

       114
       114
       -
             $machine->execute(

     

       115
       115
       -
               "ulimit -c unlimited; ".

     

       116
       116
       -
               "$pkg/bin/chromium $args \"$url\" & disown"

     

       117
       117
       -
             );

     

       118
       118
       -
             $machine->waitForText(qr/Type to search or enter a URL to navigate/);

     

       119
       119
       -
             $machine->waitUntilSucceeds("${xdo "check-startup" ''

     

       120
       120
       -
               search --sync --onlyvisible --name "startup done"

     

       121
       121
       -
               # close first start help popup

     

       122
       122
       -
               key -delay 1000 Escape

     

       123
       123
       -
               windowfocus --sync

     

       124
       124
       -
               windowactivate --sync

     

       125
       125
       -
             ''}");

     

       108
       108
       +
           my $url = "file://${startupHTML}";

     

       109
       109
       +
           my $args = "--user-data-dir=/tmp/chromium-${channel}";

     

       110
       110
       +
           $machine->execute(

     

       111
       111
       +
             "ulimit -c unlimited; ".

     

       112
       112
       +
             "chromium $args \"$url\" & disown"

     

       113
       113
       +
           );

     

       114
       114
       +
           $machine->waitForText(qr/Type to search or enter a URL to navigate/);

     

       115
       115
       +
           $machine->waitUntilSucceeds("${xdo "check-startup" ''

     

       116
       116
       +
             search --sync --onlyvisible --name "startup done"

     

       117
       117
       +
             # close first start help popup

     

       118
       118
       +
             key -delay 1000 Escape

     

       119
       119
       +
             windowfocus --sync

     

       120
       120
       +
             windowactivate --sync

     

       121
       121
       +
           ''}");

     

       126
       122
        
       

     

       127
       127
       -
             createAndWaitForNewWin;

     

       128
       128
       -
             $machine->screenshot($channel."_emptywin");

     

       129
       129
       -
             closeWin;

     

       123
       123
       +
           createAndWaitForNewWin;

     

       124
       124
       +
           $machine->screenshot("empty_windows");

     

       125
       125
       +
           closeWin;

     

       130
       126
        
       

     

       131
       131
       -
             $machine->screenshot($channel."_startup_done");

     

       127
       127
       +
           $machine->screenshot("startup_done");

     

       132
       128
        
       

     

       133
       133
       -
             subtest("Chromium $channel", $code);

     

       129
       129
       +
           testNewWin "check sandbox", sub {

     

       130
       130
       +
             $machine->succeed("${xdo "type-url" ''

     

       131
       131
       +
               search --sync --onlyvisible --name "new tab"

     

       132
       132
       +
               windowfocus --sync

     

       133
       133
       +
               type --delay 1000 "chrome://sandbox"

     

       134
       134
       +
             ''}");

     

       134
       135
        
       

     

       135
       135
       -
             $machine->shutdown;

     

       136
       136
       -
           }

     

       136
       136
       +
             $machine->succeed("${xdo "submit-url" ''

     

       137
       137
       +
               search --sync --onlyvisible --name "new tab"

     

       138
       138
       +
               windowfocus --sync

     

       139
       139
       +
               key --delay 1000 Return

     

       140
       140
       +
             ''}");

     

       137
       141
        
       

     

       138
       138
       -
           for (${let

     

       139
       139
       -
             mkArray = name: pkg: "[\"${name}\", \"${pkg}\"]";

     

       140
       140
       -
             chanArrays = pkgs.lib.mapAttrsToList mkArray channelMap;

     

       141
       141
       -
           in pkgs.lib.concatStringsSep ", " chanArrays}) {

     

       142
       142
       -
             my ($channel, $pkg) = @$_;

     

       143
       143
       -
             chromiumTest $channel, $pkg, sub {

     

       144
       144
       -
               testNewWin "check sandbox", sub {

     

       145
       145
       -
                 $machine->succeed("${xdo "type-url" ''

     

       146
       146
       -
                   search --sync --onlyvisible --name "new tab"

     

       147
       147
       -
                   windowfocus --sync

     

       148
       148
       -
                   type --delay 1000 "chrome://sandbox"

     

       149
       149
       -
                 ''}");

     

       142
       142
       +
             $machine->screenshot("sandbox_info");

     

       150
       143
        
       

     

       151
       151
       -
                 $machine->succeed("${xdo "submit-url" ''

     

       152
       152
       -
                   search --sync --onlyvisible --name "new tab"

     

       153
       153
       -
                   windowfocus --sync

     

       154
       154
       -
                   key --delay 1000 Return

     

       155
       155
       -
                 ''}");

     

       156
       156
       -
       

     

       157
       157
       -
                 $machine->screenshot($channel."_sandbox");

     

       144
       144
       +
             $machine->succeed("${xdo "submit-url" ''

     

       145
       145
       +
               search --sync --onlyvisible --name "sandbox status"

     

       146
       146
       +
               windowfocus --sync

     

       147
       147
       +
             ''}");

     

       148
       148
       +
             $machine->succeed("${xdo "submit-url" ''

     

       149
       149
       +
               key --delay 1000 Ctrl+a Ctrl+c

     

       150
       150
       +
             ''}");

     

       158
       151
        
       

     

       159
       159
       -
                 $machine->succeed("${xdo "submit-url" ''

     

       160
       160
       -
                   search --sync --onlyvisible --name "sandbox status"

     

       161
       161
       -
                   windowfocus --sync

     

       162
       162
       -
                 ''}");

     

       163
       163
       -
                 $machine->succeed("${xdo "submit-url" ''

     

       164
       164
       -
                   key --delay 1000 Ctrl+a Ctrl+c

     

       165
       165
       -
                 ''}");

     

       152
       152
       +
             my $clipboard = $machine->succeed("${pkgs.xclip}/bin/xclip -o");

     

       153
       153
       +
             die "sandbox not working properly: $clipboard"

     

       154
       154
       +
             unless $clipboard =~ /namespace sandbox.*yes/mi

     

       155
       155
       +
                 && $clipboard =~ /pid namespaces.*yes/mi

     

       156
       156
       +
                 && $clipboard =~ /network namespaces.*yes/mi

     

       157
       157
       +
                 && $clipboard =~ /seccomp.*sandbox.*yes/mi

     

       158
       158
       +
                 && $clipboard =~ /you are adequately sandboxed/mi;

     

       159
       159
       +
           };

     

       166
       160
        
       

     

       167
       167
       -
                 my $clipboard = $machine->succeed("${pkgs.xclip}/bin/xclip -o");

     

       168
       168
       -
                 die "sandbox not working properly: $clipboard"

     

       169
       169
       -
                 unless $clipboard =~ /namespace sandbox.*yes/mi

     

       170
       170
       -
                     && $clipboard =~ /pid namespaces.*yes/mi

     

       171
       171
       -
                     && $clipboard =~ /network namespaces.*yes/mi

     

       172
       172
       -
                     && $clipboard =~ /seccomp.*sandbox.*yes/mi

     

       173
       173
       -
                     && $clipboard =~ /you are adequately sandboxed/mi;

     

       174
       174
       -
               };

     

       175
       175
       -
             };

     

       176
       176
       -
           }

     

       161
       161
       +
           $machine->shutdown;

     

       177
       162
        
         '';

     

       178
       178
       -
       })

     

       163
       163
       +
       }) {

     

       164
       164
       +
         stable = pkgs.chromium;

     

       165
       165
       +
         beta   = pkgs.chromiumBeta;

     

       166
       166
       +
         dev    = pkgs.chromiumDev;

     

       167
       167
       +
       }