diff options
Diffstat (limited to 'tests/by-name/ta/taskchampion-sync')
| -rw-r--r-- | tests/by-name/ta/taskchampion-sync/test.nix | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/tests/by-name/ta/taskchampion-sync/test.nix b/tests/by-name/ta/taskchampion-sync/test.nix index 99134bc..cdbe062 100644 --- a/tests/by-name/ta/taskchampion-sync/test.nix +++ b/tests/by-name/ta/taskchampion-sync/test.nix @@ -114,26 +114,11 @@ nixos-lib.runTest { echo 'sync.encryption_secret=${password}' >> "${path}" ''; - acme_scripts = import ../../../common/acme/scripts.nix {inherit pkgs;}; + acme = import ../../../common/acme {inherit pkgs;}; in - /* - python - */ + acme.prepare ["server" "task_client1" "task_client2"] + # Python '' - # Start dependencies for the other services - acme.start() - acme.wait_for_unit("pebble.service") - name_server.start() - name_server.wait_for_unit("nsd.service") - - # Start actual test - start_all() - - with subtest("Add pebble ca key to all services"): - for node in [name_server, server, task_client1, task_client2]: - node.wait_for_unit("network-online.target") - node.succeed("${acme_scripts.add_pebble_acme_ca}") - server.wait_for_unit("taskchampion-sync-server.service") server.wait_for_open_port(443) @@ -148,7 +133,7 @@ nixos-lib.runTest { task_client2.succeed("task add 'First task -- task_client2'") # Wait for the server to acquire the acme certificate - task_client1.wait_until_succeed("curl https://taskchampion.server") + task_client1.wait_until_succeeds("curl https://taskchampion.server") with subtest("Can sync tasks"): for task in [task_client1, task_client2]: |