@@ -52,9 +52,10 @@ in
55 githost.wait_for_open_port("22")
56 githost.wait_for_open_port("22")
56 with subtest("test the client can access the server via ssh"):
58 with subtest("test the client can access the server via ssh"):
58 client.succeed("mkdir -p ~/.ssh/")
59 client.succeed("mkdir -p ~/.ssh/")
59 client.succeed(
60 client.succeed(
60 "cp ${privateKeyFile} ~/.ssh/id_rsa"
61 "cp ${privateKeyFile} ~/.ssh/id_rsa"
@@ -81,7 +82,7 @@ in
81 client.succeed('git config --global user.name "Your Name"')
82 client.succeed('git config --global user.name "Your Name"')
82 client.succeed('cd ~/code/myapp && git commit -m "Initial"')
83 client.succeed('cd ~/code/myapp && git commit -m "Initial"')
83 client.succeed(
84 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"
87 with subtest("test pushing code to the remote"):
88 with subtest("test pushing code to the remote"):
@@ -90,10 +91,10 @@ in
91 with subtest("test obelisk is installed"):
92 with subtest("test obelisk is installed"):
92 client.succeed("ob --help")
93 client.succeed("ob --help")
95− # failure: Alert: obelisk currently only supports file, https, ssh, git protocols for plain Git remotes
96 with subtest("test obelisk can pack"):
95 with subtest("test obelisk can pack"):
97 client.succeed("ob thunk pack ~/code/myapp")
96 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")