@@ -1,7 +1,7 @@
11{
22 supportedSystems ? [ builtins.currentSystem ]
33}:
4−let
4+let
55 nginxRoot = "/run/nginx";
66 obelisk = import ./default.nix {};
77 # Get NixOS a pre-release 20.03 that contains the python based tests and recursive nix
@@ -21,7 +21,7 @@ in
2121 enable = true;
2222 };
2323 environment.systemPackages = [
24− pkgs.git
24+ pkgs.git
2525 ];
2626 users.users.root.openssh.authorizedKeys.keys = [
2727 snakeOilPublicKey
@@ -38,7 +38,7 @@ in
3838 obelisk.command
3939 obelisk.shell
4040 obelisk-everywhere
41− pkgs.git
41+ pkgs.git
4242 ];
4343 };
4444 };
@@ -58,10 +58,10 @@ in
5858 in ''
5959 start_all()
6060 githost.wait_for_open_port("22")
61−
61+
6262 with subtest("test obelisk is installed"):
6363 client.succeed("ob --help")
64−
64+
6565 with subtest("test the client can access the server via ssh"):
6666 client.succeed("mkdir -p ~/.ssh/")
6767 client.succeed(
@@ -75,11 +75,11 @@ in
7575 "cp ${sshConfigFile} ~/.ssh/config"
7676 )
7777 client.wait_until_succeeds("ssh githost true")
78−
78+
7979 with subtest("test a remote bare repo can be started"):
8080 githost.succeed("mkdir -p ~/myorg/myapp.git")
8181 githost.succeed("cd ~/myorg/myapp.git && git init --bare")
82−
82+
8383 with subtest("test a git project can be configured with a remote using ssh"):
8484 client.succeed("mkdir -p ~/code/myapp")
8585 client.succeed("cd ~/code/myapp && git init")
@@ -91,16 +91,16 @@ in
9191 client.succeed(
9292 "cd ~/code/myapp && git remote add origin root@githost:/root/myorg/myapp.git"
9393 )
94−
94+
9595 with subtest("test pushing code to the remote"):
9696 client.succeed("cd ~/code/myapp && git push -u origin master")
9797 client.succeed("cd ~/code/myapp && git status")
98−
98+
9999 with subtest("test obelisk can pack"):
100100 client.succeed("ob thunk pack ~/code/myapp")
101101 client.succeed("grep -qF 'git' ~/code/myapp/default.nix")
102102 client.succeed("grep -qF 'myorg' ~/code/myapp/git.json")
103−
103+
104104 with subtest("test obelisk can detect private repos"):
105105 client.succeed("""grep -qF '"private": false' ~/code/myapp/git.json""")
106106 '';