git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #74086 from mmilata/nixos-test-port-wordpress-fix

nixosTests.wordpress: fix assertions

commitffc82d2af80a4f58b2b36c63a578734e9176ed79 authorFlorian Klink <flokli@flokli.de> dateMon 25 Nov 2019, 00:15 (7 years ago) parent817b066e290dd8
1 file changed+3−3
nixos/tests/wordpress.nix+3−3
nixos/tests/wordpress.nix+3−3
@@ -45,12 +45,12 @@ import ./make-test-python.nix ({ pkgs, ... }:
4545 with subtest("wordpress-init went through"):
4646 for site_name in site_names:
4747 info = machine.get_unit_info(f"wordpress-init-{site_name}")
48− assert info.Result == "success"
48+ assert info["Result"] == "success"
4949
5050 with subtest("secret keys are set"):
51− re.compile(r"^define.*NONCE_SALT.{64,};$")
51+ pattern = re.compile(r"^define.*NONCE_SALT.{64,};$", re.MULTILINE)
5252 for site_name in site_names:
53− assert r.match(
53+ assert pattern.search(
5454 machine.succeed(f"cat /var/lib/wordpress/{site_name}/secret-keys.php")
5555 )
5656 '';