diff options
author | Florian Klink <flokli@flokli.de> | 2019-11-11 01:56:24 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-11 01:56:24 +0100 |
commit | 848399f448201d0d2f2096e07c09d86899ccc235 (patch) | |
tree | 6723343a0b59ad3952aebaad4771c502363c7d90 /nixos/tests | |
parent | 9b51c5145ad58d49cefdba24d5bc53abb6017143 (diff) | |
parent | 1c5bfddbc925b368597dff35bbea0f94ea035c88 (diff) | |
download | nixlib-848399f448201d0d2f2096e07c09d86899ccc235.tar nixlib-848399f448201d0d2f2096e07c09d86899ccc235.tar.gz nixlib-848399f448201d0d2f2096e07c09d86899ccc235.tar.bz2 nixlib-848399f448201d0d2f2096e07c09d86899ccc235.tar.lz nixlib-848399f448201d0d2f2096e07c09d86899ccc235.tar.xz nixlib-848399f448201d0d2f2096e07c09d86899ccc235.tar.zst nixlib-848399f448201d0d2f2096e07c09d86899ccc235.zip |
Merge pull request #72390 from flokli/bump-opensmtpd
opensmtpd: 6.4.2p1 -> 6.6.1p1
Diffstat (limited to 'nixos/tests')
-rw-r--r-- | nixos/tests/opensmtpd.nix | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/nixos/tests/opensmtpd.nix b/nixos/tests/opensmtpd.nix index 883ad7604941..e6f52db1d984 100644 --- a/nixos/tests/opensmtpd.nix +++ b/nixos/tests/opensmtpd.nix @@ -1,4 +1,4 @@ -import ./make-test.nix { +import ./make-test-python.nix { name = "opensmtpd"; nodes = { @@ -102,23 +102,23 @@ import ./make-test.nix { }; testScript = '' - startAll; + start_all() - $client->waitForUnit("network-online.target"); - $smtp1->waitForUnit('opensmtpd'); - $smtp2->waitForUnit('opensmtpd'); - $smtp2->waitForUnit('dovecot2'); + client.wait_for_unit("network-online.target") + smtp1.wait_for_unit("opensmtpd") + smtp2.wait_for_unit("opensmtpd") + smtp2.wait_for_unit("dovecot2") # To prevent sporadic failures during daemon startup, make sure # services are listening on their ports before sending requests - $smtp1->waitForOpenPort(25); - $smtp2->waitForOpenPort(25); - $smtp2->waitForOpenPort(143); + smtp1.wait_for_open_port(25) + smtp2.wait_for_open_port(25) + smtp2.wait_for_open_port(143) - $client->succeed('send-a-test-mail'); - $smtp1->waitUntilFails('smtpctl show queue | egrep .'); - $smtp2->waitUntilFails('smtpctl show queue | egrep .'); - $client->succeed('check-mail-landed >&2'); + client.succeed("send-a-test-mail") + smtp1.wait_until_fails("smtpctl show queue | egrep .") + smtp2.wait_until_fails("smtpctl show queue | egrep .") + client.succeed("check-mail-landed >&2") ''; meta.timeout = 30; |