diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2019-11-25 15:59:05 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2019-11-25 15:59:05 -0500 |
| commit | f191360ad051fc1bc153fb5193ed14820b99aa84 (patch) | |
| tree | 322ec8fe6301372bb6a95428e3555faf41bdaf5c /nixos/tests/syncthing-init.nix | |
| parent | 64396d112a5d9c920826c6e035d9fed66b17ac23 (diff) | |
| parent | 06a054e6eb9d5ad395aa89e598205aa2c56afb61 (diff) | |
| download | nixlib-f191360ad051fc1bc153fb5193ed14820b99aa84.tar nixlib-f191360ad051fc1bc153fb5193ed14820b99aa84.tar.gz nixlib-f191360ad051fc1bc153fb5193ed14820b99aa84.tar.bz2 nixlib-f191360ad051fc1bc153fb5193ed14820b99aa84.tar.lz nixlib-f191360ad051fc1bc153fb5193ed14820b99aa84.tar.xz nixlib-f191360ad051fc1bc153fb5193ed14820b99aa84.tar.zst nixlib-f191360ad051fc1bc153fb5193ed14820b99aa84.zip | |
Merge remote-tracking branch 'upstream/staging-next' into staging
Diffstat (limited to 'nixos/tests/syncthing-init.nix')
| -rw-r--r-- | nixos/tests/syncthing-init.nix | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/nixos/tests/syncthing-init.nix b/nixos/tests/syncthing-init.nix index 0de76b688bdc..9c8e0a3d087e 100644 --- a/nixos/tests/syncthing-init.nix +++ b/nixos/tests/syncthing-init.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ({ lib, pkgs, ... }: let +import ./make-test-python.nix ({ lib, pkgs, ... }: let testId = "7CFNTQM-IMTJBHJ-3UWRDIU-ZGQJFR6-VCXZ3NB-XUH3KZO-N52ITXR-LAIYUAU"; @@ -22,13 +22,11 @@ in { }; testScript = '' - my $config; - - $machine->waitForUnit("syncthing-init.service"); - $config = $machine->succeed("cat /var/lib/syncthing/.config/syncthing/config.xml"); + machine.wait_for_unit("syncthing-init.service") + config = machine.succeed("cat /var/lib/syncthing/.config/syncthing/config.xml") - $config =~ /${testId}/ or die; - $config =~ /testFolder/ or die; + assert "testFolder" in config + assert "${testId}" in config ''; }) |