From c382ad1e17c3b11374a1c1d72f6623e163d01b11 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Apr 2014 16:09:32 +0200
Subject: [PATCH] Fix tests

Doing a =~ regexp check doesn't do anything in itself...
---
 nixos/tests/containers.nix | 4 ++--
 nixos/tests/udisks.nix     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/tests/containers.nix b/nixos/tests/containers.nix
index 9580f18189a2..8ad9cd6e0d79 100644
--- a/nixos/tests/containers.nix
+++ b/nixos/tests/containers.nix
@@ -25,7 +25,7 @@ import ./make-test.nix {
 
   testScript =
     ''
-      $machine->succeed("nixos-container list") =~ /webserver/;
+      $machine->succeed("nixos-container list") =~ /webserver/ or die;
 
       # Start the webserver container.
       $machine->succeed("nixos-container start webserver");
@@ -65,7 +65,7 @@ import ./make-test.nix {
       $machine->succeed("nixos-container start $id1");
 
       # Execute commands via the root shell.
-      $machine->succeed("nixos-container run $id1 -- uname") =~ /Linux/;
+      $machine->succeed("nixos-container run $id1 -- uname") =~ /Linux/ or die;
       $machine->succeed("nixos-container set-root-password $id1 foobar");
 
       # Destroy the containers.
diff --git a/nixos/tests/udisks.nix b/nixos/tests/udisks.nix
index 2354c3106618..b7f2e2c00315 100644
--- a/nixos/tests/udisks.nix
+++ b/nixos/tests/udisks.nix
@@ -40,7 +40,7 @@ in
       # Mount the stick as a non-root user and do some stuff with it.
       $machine->succeed("su - alice -c 'udisks --enumerate | grep /org/freedesktop/UDisks/devices/sda1'");
       $machine->succeed("su - alice -c 'udisks --mount /dev/sda1'");
-      $machine->succeed("su - alice -c 'cat /media/USBSTICK/test.txt'") =~ /Hello World/;
+      $machine->succeed("su - alice -c 'cat /media/USBSTICK/test.txt'") =~ /Hello World/ or die;
       $machine->succeed("su - alice -c 'echo foo > /media/USBSTICK/bar.txt'");
 
       # Unmounting the stick should make the mountpoint disappear.