JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nixos/tests: fix type mismatch in wait_for_open_port

Browse Source 
Fix some fallout from de3e423 (PR #171280).
This commit is contained in:
rnhmjoj 2022-06-11 14:22:53 +02:00
parent 6bd5219cc1
commit 5803706662
No known key found for this signature in database
GPG Key ID: BFBAF4C975F76450
33 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/tests/3proxy.nix
View File

@ -139,7 +139,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
peer0.wait_for_unit("network-online.target")
peer1.wait_for_unit("3proxy.service")
peer1.wait_for_open_port("9999")
peer1.wait_for_open_port(9999)
# test none auth
peer0.succeed(
@ -153,7 +153,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
)
peer2.wait_for_unit("3proxy.service")
peer2.wait_for_open_port("9999")
peer2.wait_for_open_port(9999)
# test iponly auth
peer0.succeed(
@ -167,7 +167,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
)
peer3.wait_for_unit("3proxy.service")
peer3.wait_for_open_port("9999")
peer3.wait_for_open_port(9999)
# test strong auth
peer0.succeed(

2
nixos/tests/bazarr.nix
View File

@ -20,7 +20,7 @@ in
testScript = ''
machine.wait_for_unit("bazarr.service")
machine.wait_for_open_port("${toString port}")
machine.wait_for_open_port(port)
machine.succeed("curl --fail http://localhost:${toString port}/")
'';
})

8
nixos/tests/caddy.nix
View File

@ -61,7 +61,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
''
url = "http://localhost/example.html"
webserver.wait_for_unit("caddy")
webserver.wait_for_open_port("80")
webserver.wait_for_open_port(80)
def check_etag(url):
@ -95,13 +95,13 @@ import ./make-test-python.nix ({ pkgs, ... }: {
webserver.succeed(
"${justReloadSystem}/bin/switch-to-configuration test >&2"
)
webserver.wait_for_open_port("8080")
webserver.wait_for_open_port(8080)
with subtest("multiple configs are correctly merged"):
webserver.succeed(
"${multipleConfigs}/bin/switch-to-configuration test >&2"
)
webserver.wait_for_open_port("8080")
webserver.wait_for_open_port("8081")
webserver.wait_for_open_port(8080)
webserver.wait_for_open_port(8081)
'';
})

2
nixos/tests/convos.nix
View File

@ -23,7 +23,7 @@ in
testScript = ''
machine.wait_for_unit("convos")
machine.wait_for_open_port("${toString port}")
machine.wait_for_open_port(port)
machine.succeed("journalctl -u convos | grep -q 'Listening at.*${toString port}'")
machine.succeed("curl -f http://localhost:${toString port}/")
'';

2
nixos/tests/cryptpad.nix
View File

@ -12,7 +12,7 @@ with lib;
testScript = ''
machine.wait_for_unit("cryptpad.service")
machine.wait_for_open_port("3000")
machine.wait_for_open_port(3000)
machine.succeed("curl -L --fail http://localhost:3000/sheet")
'';
})

2
nixos/tests/deluge.nix
View File

@ -47,7 +47,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
simple.wait_for_unit("deluged")
simple.wait_for_unit("delugeweb")
simple.wait_for_open_port("8112")
simple.wait_for_open_port(8112)
declarative.wait_for_unit("network.target")
declarative.wait_until_succeeds("curl --fail http://simple:8112")

2
nixos/tests/docker-registry.nix
View File

@ -35,7 +35,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
registry.start()
registry.wait_for_unit("docker-registry.service")
registry.wait_for_open_port("8080")
registry.wait_for_open_port(8080)
client1.succeed("docker push registry:8080/scratch")
client2.start()

2
nixos/tests/freeswitch.nix
View File

@ -24,6 +24,6 @@ import ./make-test-python.nix ({ pkgs, ...} : {
testScript = ''
node0.wait_for_unit("freeswitch.service")
# Wait for SIP port to be open
node0.wait_for_open_port("5060")
node0.wait_for_open_port(5060)
'';
})

2
nixos/tests/gocd-agent.nix
View File

@ -36,7 +36,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
testScript = ''
start_all()
agent.wait_for_unit("gocd-server")
agent.wait_for_open_port("8153")
agent.wait_for_open_port(8153)
agent.wait_for_unit("gocd-agent")
agent.wait_until_succeeds(
"curl ${serverUrl} -H '${header}' | ${pkgs.jq}/bin/jq -e ._embedded.agents[0].uuid"

2
nixos/tests/isso.nix
View File

@ -22,7 +22,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
''
machine.wait_for_unit("isso.service")
machine.wait_for_open_port("${toString port}")
machine.wait_for_open_port(port)
machine.succeed("curl --fail http://localhost:${toString port}/?uri")
machine.succeed("curl --fail http://localhost:${toString port}/js/embed.min.js")

2
nixos/tests/libreddit.nix
View File

@ -14,7 +14,7 @@ with lib;
testScript = ''
machine.wait_for_unit("libreddit.service")
machine.wait_for_open_port("80")
machine.wait_for_open_port(80)
# Query a page that does not require Internet access
machine.succeed("curl --fail http://localhost:80/settings")
'';

2
nixos/tests/lidarr.nix
View File

@ -14,7 +14,7 @@ with lib;
start_all()
machine.wait_for_unit("lidarr.service")
machine.wait_for_open_port("8686")
machine.wait_for_open_port(8686)
machine.succeed("curl --fail http://localhost:8686/")
'';
})

2
nixos/tests/mailcatcher.nix
View File

@ -24,7 +24,7 @@ import ./make-test-python.nix ({ lib, ... }:
start_all()
machine.wait_for_unit("mailcatcher.service")
machine.wait_for_open_port("1025")
machine.wait_for_open_port(1025)
machine.succeed(
'echo "this is the body of the email" | mail -s "subject" root@example.org'
)

4
nixos/tests/mailhog.nix
View File

@ -12,8 +12,8 @@ import ./make-test-python.nix ({ lib, ... }: {
start_all()
machine.wait_for_unit("mailhog.service")
machine.wait_for_open_port("1025")
machine.wait_for_open_port("8025")
machine.wait_for_open_port(1025)
machine.wait_for_open_port(8025)
machine.succeed(
'echo "this is the body of the email" | swaks --to root@example.org --body - --server localhost:1025'
)

2
nixos/tests/meilisearch.nix
View File

@ -27,7 +27,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
start_all()
machine.wait_for_unit("meilisearch")
machine.wait_for_open_port("7700")
machine.wait_for_open_port(7700)
with subtest("check version"):
version = json.loads(machine.succeed("curl ${apiUrl}/version"))

2
nixos/tests/minidlna.nix
View File

@ -32,7 +32,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
start_all()
server.succeed("mkdir -p /tmp/stuff && chown minidlna: /tmp/stuff")
server.wait_for_unit("minidlna")
server.wait_for_open_port("8200")
server.wait_for_open_port(8200)
# requests must be made *by IP* to avoid triggering minidlna's
# DNS-rebinding protection
server.succeed("curl --fail http://$(getent ahostsv4 localhost | head -n1 | cut -f 1 -d ' '):8200/")

2
nixos/tests/navidrome.nix
View File

@ -7,6 +7,6 @@ import ./make-test-python.nix ({ pkgs, ... }: {
testScript = ''
machine.wait_for_unit("navidrome")
machine.wait_for_open_port("4533")
machine.wait_for_open_port(4533)
'';
})

4
nixos/tests/ncdns.nix
View File

@ -73,14 +73,14 @@ in
with subtest("DNSKEY bit record is present"):
server.wait_for_unit("pdns-recursor")
server.wait_for_open_port("53")
server.wait_for_open_port(53)
server.succeed("host -t DNSKEY bit")
'') +
''
with subtest("can resolve a .bit name"):
server.wait_for_unit("namecoind")
server.wait_for_unit("ncdns")
server.wait_for_open_port("8332")
server.wait_for_open_port(8332)
assert "1.2.3.4" in server.succeed("dig @localhost -p 5333 test.bit")
with subtest("SOA record has identity information"):

4
nixos/tests/nghttpx.nix
View File

@ -54,8 +54,8 @@ in
testScript = ''
start_all()
webserver.wait_for_open_port("80")
proxy.wait_for_open_port("80")
webserver.wait_for_open_port(80)
proxy.wait_for_open_port(80)
client.wait_until_succeeds("curl -s --fail http://proxy/hello-world.txt")
'';
})

2
nixos/tests/node-red.nix
View File

@ -19,7 +19,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
testScript = ''
start_all()
nodered.wait_for_unit("node-red.service")
nodered.wait_for_open_port("1880")
nodered.wait_for_open_port(1880)
client.wait_for_unit("multi-user.target")

2
nixos/tests/ombi.nix
View File

@ -12,7 +12,7 @@ with lib;
testScript = ''
machine.wait_for_unit("ombi.service")
machine.wait_for_open_port("5000")
machine.wait_for_open_port(5000)
machine.succeed("curl --fail http://localhost:5000/")
'';
})

2
nixos/tests/pdns-recursor.nix
View File

@ -9,7 +9,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
testScript = ''
server.wait_for_unit("pdns-recursor")
server.wait_for_open_port("53")
server.wait_for_open_port(53)
assert "192.0.2.1" in server.succeed("host example.com localhost")
'';
})

2
nixos/tests/pict-rs.nix
View File

@ -12,6 +12,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
start_all()
machine.wait_for_unit("pict-rs")
machine.wait_for_open_port("8080")
machine.wait_for_open_port(8080)
'';
})

2
nixos/tests/plikd.nix
View File

@ -15,7 +15,7 @@ import ./make-test-python.nix ({ lib, ... }: {
machine.wait_for_unit("plikd")
# Network test
machine.wait_for_open_port("8080")
machine.wait_for_open_port(8080)
machine.succeed("curl --fail -v http://localhost:8080")
# Application test

4
nixos/tests/podgrab.nix
View File

@ -22,11 +22,11 @@ import ./make-test-python.nix ({ pkgs, ... }: {
start_all()
default.wait_for_unit("podgrab")
default.wait_for_open_port("${toString defaultPort}")
default.wait_for_open_port(defaultPort)
default.succeed("curl --fail http://localhost:${toString defaultPort}")
customized.wait_for_unit("podgrab")
customized.wait_for_open_port("${toString customPort}")
customized.wait_for_open_port(customPort)
customized.succeed("curl --fail http://localhost:${toString customPort}")
'';

8
nixos/tests/privoxy.nix
View File

@ -81,23 +81,23 @@ in
''
with subtest("Privoxy is running"):
machine.wait_for_unit("privoxy")
machine.wait_for_open_port("8118")
machine.wait_for_open_port(8118)
machine.succeed("curl -f http://config.privoxy.org")
with subtest("Privoxy can filter http requests"):
machine.wait_for_open_port("80")
machine.wait_for_open_port(80)
assert "great day" in machine.succeed(
"curl -sfL http://example.com/how-are-you? | tee /dev/stderr"
)
with subtest("Privoxy can filter https requests"):
machine.wait_for_open_port("443")
machine.wait_for_open_port(443)
assert "great day" in machine.succeed(
"curl -sfL https://example.com/how-are-you? | tee /dev/stderr"
)
with subtest("Blocks are working"):
machine.wait_for_open_port("443")
machine.wait_for_open_port(443)
machine.fail("curl -f https://example.com/ads 1>&2")
machine.succeed("curl -f https://example.com/PRIVOXY-FORCE/ads 1>&2")

2
nixos/tests/prometheus-exporters.nix
View File

@ -52,7 +52,7 @@ let
* testScript = ''
* <exporterName>.start()
* <exporterName>.wait_for_unit("prometheus-<exporterName>-exporter.service")
* <exporterName>.wait_for_open_port("1234")
* <exporterName>.wait_for_open_port(1234)
* <exporterName>.succeed("curl -sSf 'localhost:1234/metrics'")
* <exporterName>.shutdown()
* '';

2
nixos/tests/prowlarr.nix
View File

@ -12,7 +12,7 @@ with lib;
testScript = ''
machine.wait_for_unit("prowlarr.service")
machine.wait_for_open_port("9696")
machine.wait_for_open_port(9696)
machine.succeed("curl --fail http://localhost:9696/")
'';
})

2
nixos/tests/rabbitmq.nix
View File

@ -22,6 +22,6 @@ import ./make-test-python.nix ({ pkgs, ... }: {
machine.wait_until_succeeds(
'su -s ${pkgs.runtimeShell} rabbitmq -c "rabbitmqctl status"'
)
machine.wait_for_open_port("15672")
machine.wait_for_open_port(15672)
'';
})

2
nixos/tests/redis.nix
View File

@ -30,7 +30,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
machine.wait_for_unit("redis-test")
# The unnamed Redis server still opens a port for backward-compatibility
machine.wait_for_open_port("6379")
machine.wait_for_open_port(6379)
machine.wait_for_file("${redis.servers."".unixSocket}")
machine.wait_for_file("${redis.servers."test".unixSocket}")

2
nixos/tests/sonarr.nix
View File

@ -12,7 +12,7 @@ with lib;
testScript = ''
machine.wait_for_unit("sonarr.service")
machine.wait_for_open_port("8989")
machine.wait_for_open_port(8989)
machine.succeed("curl --fail http://localhost:8989/")
'';
})

12
nixos/tests/teleport.nix
View File

@ -72,9 +72,9 @@ in
nodes = { inherit minimal; };
testScript = ''
minimal.wait_for_open_port("3025")
minimal.wait_for_open_port("3080")
minimal.wait_for_open_port("3022")
minimal.wait_for_open_port(3025)
minimal.wait_for_open_port(3080)
minimal.wait_for_open_port(3022)
'';
};
@ -86,12 +86,12 @@ in
testScript = ''
with subtest("teleport ready"):
server.wait_for_open_port("3025")
client.wait_for_open_port("3022")
server.wait_for_open_port(3025)
client.wait_for_open_port(3022)
with subtest("check applied configuration"):
server.wait_until_succeeds("tctl get nodes --format=json | ${pkgs.jq}/bin/jq -e '.[] | select(.spec.hostname==\"client\") | .metadata.labels.role==\"client\"'")
server.wait_for_open_port("3000")
server.wait_for_open_port(3000)
client.succeed("journalctl -u teleport.service --grep='DEBU'")
server.succeed("journalctl -u teleport.service --grep='Starting teleport in insecure mode.'")
'';

2
nixos/tests/vsftpd.nix
View File

@ -29,7 +29,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
testScript = ''
client.start()
server.wait_for_unit("vsftpd")
server.wait_for_open_port("21")
server.wait_for_open_port(21)
client.succeed("curl -u ftp-test-user:ftp-test-password ftp://server")
client.succeed('echo "this is a test" > /tmp/test.file.up')