summary refs log tree commit diff
path: root/nixos/tests/env.nix
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2019-12-10 19:00:06 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2019-12-10 19:01:27 +0100
commitf3618342ece994482697892133532a380a04cd0f (patch)
treebd6067d893770d9f7d272aaa5c5968ff517769d0 /nixos/tests/env.nix
parent5e7e4c93a9a93c12d5eaa3a91e289d18195aaa75 (diff)
parent2ff8cef0a4c969b9c377db4e0fe6eb8f5404e0b4 (diff)
downloadnixpkgs-f3618342ece994482697892133532a380a04cd0f.tar
nixpkgs-f3618342ece994482697892133532a380a04cd0f.tar.gz
nixpkgs-f3618342ece994482697892133532a380a04cd0f.tar.bz2
nixpkgs-f3618342ece994482697892133532a380a04cd0f.tar.lz
nixpkgs-f3618342ece994482697892133532a380a04cd0f.tar.xz
nixpkgs-f3618342ece994482697892133532a380a04cd0f.tar.zst
nixpkgs-f3618342ece994482697892133532a380a04cd0f.zip
Merge staging-next into staging
Diffstat (limited to 'nixos/tests/env.nix')
-rw-r--r--nixos/tests/env.nix25
1 files changed, 13 insertions, 12 deletions
diff --git a/nixos/tests/env.nix b/nixos/tests/env.nix
index 6c681905b19..e603338e489 100644
--- a/nixos/tests/env.nix
+++ b/nixos/tests/env.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
   name = "environment";
   meta = with pkgs.stdenv.lib.maintainers; {
     maintainers = [ nequissimus ];
@@ -20,16 +20,17 @@ import ./make-test.nix ({ pkgs, ...} : {
       };
     };
 
-  testScript =
-    ''
-      $machine->succeed('[ -L "/etc/plainFile" ]');
-      $machine->succeed('cat "/etc/plainFile" | grep "Hello World"');
-      $machine->succeed('[ -d "/etc/folder" ]');
-      $machine->succeed('[ -d "/etc/folder/with" ]');
-      $machine->succeed('[ -L "/etc/folder/with/file" ]');
-      $machine->succeed('cat "/etc/plainFile" | grep "Hello World"');
+  testScript = ''
+    machine.succeed('[ -L "/etc/plainFile" ]')
+    assert "Hello World" in machine.succeed('cat "/etc/plainFile"')
+    machine.succeed('[ -d "/etc/folder" ]')
+    machine.succeed('[ -d "/etc/folder/with" ]')
+    machine.succeed('[ -L "/etc/folder/with/file" ]')
+    assert "Hello World" in machine.succeed('cat "/etc/plainFile"')
 
-      $machine->succeed('echo ''${TERMINFO_DIRS} | grep "/run/current-system/sw/share/terminfo"');
-      $machine->succeed('echo ''${NIXCON} | grep "awesome"');
-    '';
+    assert "/run/current-system/sw/share/terminfo" in machine.succeed(
+        "echo ''${TERMINFO_DIRS}"
+    )
+    assert "awesome" in machine.succeed("echo ''${NIXCON}")
+  '';
 })