about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorChristian Kampka <christian@kampka.net>2019-12-15 18:41:38 +0100
committerChristian Kampka <christian@kampka.net>2019-12-15 20:07:59 +0100
commit1bf1ec35bca08d05b06bf6c627b2a1205bdca2ad (patch)
treeefd19379a7db34a2664c1c843171d49904dcd9d1 /nixos
parentd029e28b78ec535cfd37a9d26d18e7b248077c79 (diff)
downloadnixlib-1bf1ec35bca08d05b06bf6c627b2a1205bdca2ad.tar
nixlib-1bf1ec35bca08d05b06bf6c627b2a1205bdca2ad.tar.gz
nixlib-1bf1ec35bca08d05b06bf6c627b2a1205bdca2ad.tar.bz2
nixlib-1bf1ec35bca08d05b06bf6c627b2a1205bdca2ad.tar.lz
nixlib-1bf1ec35bca08d05b06bf6c627b2a1205bdca2ad.tar.xz
nixlib-1bf1ec35bca08d05b06bf6c627b2a1205bdca2ad.tar.zst
nixlib-1bf1ec35bca08d05b06bf6c627b2a1205bdca2ad.zip
nixosTests.php-pcre: Port tests to python
Diffstat (limited to 'nixos')
-rw-r--r--nixos/tests/php-pcre.nix9
1 files changed, 5 insertions, 4 deletions
diff --git a/nixos/tests/php-pcre.nix b/nixos/tests/php-pcre.nix
index ae44aec7944f..d5c22e0582a0 100644
--- a/nixos/tests/php-pcre.nix
+++ b/nixos/tests/php-pcre.nix
@@ -1,7 +1,7 @@
 
 let testString = "can-use-subgroups"; in
 
-import ./make-test.nix ({ ...}: {
+import ./make-test-python.nix ({ ...}: {
   name = "php-httpd-pcre-jit-test";
   machine = { lib, pkgs, ... }: {
     time.timeZone = "UTC";
@@ -31,9 +31,10 @@ import ./make-test.nix ({ ...}: {
   };
   testScript = { ... }:
   ''
-    $machine->waitForUnit('httpd.service');
+    machine.wait_for_unit("httpd.service")
     # Ensure php evaluation by matching on the var_dump syntax
-    $machine->succeed('curl -vvv -s http://127.0.0.1:80/index.php \
-      | grep "string(${toString (builtins.stringLength testString)}) \"${testString}\""');
+    assert 'string(${toString (builtins.stringLength testString)}) "${testString}"' in machine.succeed(
+        "curl -vvv -s http://127.0.0.1:80/index.php"
+    )
   '';
 })