diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-11-20 14:32:58 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-11-20 14:32:58 +0100 |
| commit | 333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb (patch) | |
| tree | 0f4757ddd2bb3d73b438eea85828d8e01c049583 /nixos/tests | |
| parent | bdbbfa0d4247e203ffe3171621b614374da05f70 (diff) | |
| parent | b809f886c0bdbd4665fc65a4c308d38a30c368d8 (diff) | |
| download | nixlib-333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb.tar nixlib-333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb.tar.gz nixlib-333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb.tar.bz2 nixlib-333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb.tar.lz nixlib-333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb.tar.xz nixlib-333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb.tar.zst nixlib-333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb.zip | |
Merge staging into closure-size
The most complex problems were from dealing with switches reverted in the meantime (gcc5, gmp6, ncurses6). It's likely that darwin is (still) broken nontrivially.
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/docker.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/gnome3.nix | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/nixos/tests/docker.nix b/nixos/tests/docker.nix index 034dcb04adfd..635a97e2ce09 100644 --- a/nixos/tests/docker.nix +++ b/nixos/tests/docker.nix @@ -11,6 +11,8 @@ import ./make-test.nix ({ pkgs, ...} : { { config, pkgs, ... }: { virtualisation.docker.enable = true; + # FIXME: The default "devicemapper" storageDriver fails in NixOS VM + # tests. virtualisation.docker.storageDriver = "overlay"; }; }; diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3.nix index 7662efe1b350..714b35503706 100644 --- a/nixos/tests/gnome3.nix +++ b/nixos/tests/gnome3.nix @@ -28,7 +28,7 @@ import ./make-test.nix ({ pkgs, ...} : { $machine->succeed("su - alice -c 'DISPLAY=:0.0 gnome-terminal &'"); $machine->waitForWindow(qr/Terminal/); - $machine->mustSucceed("timeout 60 bash -c 'journalctl -f|grep -m 1 \"GNOME Shell started\"'"); + $machine->mustSucceed("timeout 900 bash -c 'journalctl -f|grep -m 1 \"GNOME Shell started\"'"); $machine->sleep(10); $machine->screenshot("screen"); ''; |