about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMartin Milata <martin@martinmilata.cz>2019-11-25 00:01:06 +0100
committerMartin Milata <martin@martinmilata.cz>2019-11-25 00:01:51 +0100
commite290dd881c050919714686489101ec0d85b10e89 (patch)
treed31992997d4baa8b2822bbfc733d63eefcde6f2e
parent35d99698aecce66f5b6597d3b8efa2b23e120636 (diff)
downloadnixlib-e290dd881c050919714686489101ec0d85b10e89.tar
nixlib-e290dd881c050919714686489101ec0d85b10e89.tar.gz
nixlib-e290dd881c050919714686489101ec0d85b10e89.tar.bz2
nixlib-e290dd881c050919714686489101ec0d85b10e89.tar.lz
nixlib-e290dd881c050919714686489101ec0d85b10e89.tar.xz
nixlib-e290dd881c050919714686489101ec0d85b10e89.tar.zst
nixlib-e290dd881c050919714686489101ec0d85b10e89.zip
nixosTests.wordpress: fix assertions
-rw-r--r--nixos/tests/wordpress.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/tests/wordpress.nix b/nixos/tests/wordpress.nix
index 64c533d70f42..b7449859f7e6 100644
--- a/nixos/tests/wordpress.nix
+++ b/nixos/tests/wordpress.nix
@@ -45,12 +45,12 @@ import ./make-test-python.nix ({ pkgs, ... }:
     with subtest("wordpress-init went through"):
         for site_name in site_names:
             info = machine.get_unit_info(f"wordpress-init-{site_name}")
-            assert info.Result == "success"
+            assert info["Result"] == "success"
 
     with subtest("secret keys are set"):
-        re.compile(r"^define.*NONCE_SALT.{64,};$")
+        pattern = re.compile(r"^define.*NONCE_SALT.{64,};$", re.MULTILINE)
         for site_name in site_names:
-            assert r.match(
+            assert pattern.search(
                 machine.succeed(f"cat /var/lib/wordpress/{site_name}/secret-keys.php")
             )
   '';