@@ -51,29 +51,31 @@ in makeTest {
5151 networking.hostName = "";
5252 };
5353 testScript = ''
54− machine.wait_for_unit("cloud-init.service")
55− machine.succeed("cat /tmp/cloudinit-write-file | grep -q 'cloudinit'")
54+ # To wait until cloud-init terminates its run
55+ unnamed.wait_for_unit("cloud-final.service")
56+
57+ unnamed.succeed("cat /tmp/cloudinit-write-file | grep -q 'cloudinit'")
5658
5759 # install snakeoil ssh key and provision .ssh/config file
58− machine.succeed("mkdir -p ~/.ssh")
59− machine.succeed(
60+ unnamed.succeed("mkdir -p ~/.ssh")
61+ unnamed.succeed(
6062 "cat ${snakeOilPrivateKey} > ~/.ssh/id_snakeoil"
6163 )
62− machine.succeed("chmod 600 ~/.ssh/id_snakeoil")
64+ unnamed.succeed("chmod 600 ~/.ssh/id_snakeoil")
6365
64− machine.wait_for_unit("sshd.service")
66+ unnamed.wait_for_unit("sshd.service")
6567
6668 # we should be able to log in as the root user, as well as the created nixos user
67− machine.succeed(
69+ unnamed.succeed(
6870 "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o IdentityFile=~/.ssh/id_snakeoil root@localhost 'true'"
6971 )
70− machine.succeed(
72+ unnamed.succeed(
7173 "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o IdentityFile=~/.ssh/id_snakeoil nixos@localhost 'true'"
7274 )
7375
7476 # test changing hostname via cloud-init worked
7577 assert (
76− machine.succeed(
78+ unnamed.succeed(
7779 "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o IdentityFile=~/.ssh/id_snakeoil nixos@localhost 'hostname'"
7880 ).strip()
7981 == "test"