@@ -5,7 +5,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
55 };
66
77 nodes = {
8− simple2 = {
8+ simple = {
99 services.deluge = {
1010 enable = true;
1111 package = pkgs.deluge-2_x;
@@ -16,7 +16,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
1616 };
1717 };
1818
19− declarative2 = {
19+ declarative = {
2020 services.deluge = {
2121 enable = true;
2222 package = pkgs.deluge-2_x;
@@ -45,27 +45,16 @@ import ./make-test-python.nix ({ pkgs, ...} : {
4545 testScript = ''
4646 start_all()
4747
48− simple1.wait_for_unit("deluged")
49− simple2.wait_for_unit("deluged")
50− simple1.wait_for_unit("delugeweb")
51− simple2.wait_for_unit("delugeweb")
52− simple1.wait_for_open_port("8112")
53− simple2.wait_for_open_port("8112")
54− declarative1.wait_for_unit("network.target")
55− declarative2.wait_for_unit("network.target")
56− declarative1.wait_until_succeeds("curl --fail http://simple1:8112")
57− declarative2.wait_until_succeeds("curl --fail http://simple2:8112")
48+ simple.wait_for_unit("deluged")
49+ simple.wait_for_unit("delugeweb")
50+ simple.wait_for_open_port("8112")
51+ declarative.wait_for_unit("network.target")
52+ declarative.wait_until_succeeds("curl --fail http://simple:8112")
5853
59− declarative1.wait_for_unit("deluged")
60− declarative2.wait_for_unit("deluged")
61− declarative1.wait_for_unit("delugeweb")
62− declarative2.wait_for_unit("delugeweb")
63− declarative1.wait_until_succeeds("curl --fail http://declarative1:3142")
64− declarative2.wait_until_succeeds("curl --fail http://declarative2:3142")
65− declarative1.succeed(
66− "deluge-console 'connect 127.0.0.1:58846 andrew password; help' | grep -q 'rm.*Remove a torrent'"
67− )
68− declarative2.succeed(
54+ declarative.wait_for_unit("deluged")
55+ declarative.wait_for_unit("delugeweb")
56+ declarative.wait_until_succeeds("curl --fail http://declarative:3142")
57+ declarative.succeed(
6958 "deluge-console 'connect 127.0.0.1:58846 andrew password; help' | grep -q 'rm.*Remove a torrent'"
7059 )
7160 '';