@@ -52,9 +52,10 @@ in
5252 User=root
5353 '';
5454 in ''
55+ start_all()
5556 githost.wait_for_open_port("22")
57+
5658 with subtest("test the client can access the server via ssh"):
57− start_all()
5859 client.succeed("mkdir -p ~/.ssh/")
5960 client.succeed(
6061 "cp ${privateKeyFile} ~/.ssh/id_rsa"
@@ -81,7 +82,7 @@ in
8182 client.succeed('git config --global user.name "Your Name"')
8283 client.succeed('cd ~/code/myapp && git commit -m "Initial"')
8384 client.succeed(
84− "cd ~/code/myapp && git remote add origin githost:/root/myorg/myapp.git"
85+ "cd ~/code/myapp && git remote add origin root@githost:/root/myorg/myapp.git"
8586 )
8687
8788 with subtest("test pushing code to the remote"):
@@ -90,10 +91,10 @@ in
9091
9192 with subtest("test obelisk is installed"):
9293 client.succeed("ob --help")
93− '';
94− failingTests = ''
95− # failure: Alert: obelisk currently only supports file, https, ssh, git protocols for plain Git remotes
94+
9695 with subtest("test obelisk can pack"):
9796 client.succeed("ob thunk pack ~/code/myapp")
97+ client.succeed("grep -qF 'git' ~/code/myapp/default.nix")
98+ client.succeed("grep -qF 'myorg' ~/code/myapp/git.json")
9899 '';
99100 })