Skip to content

Commit d69dedb

Browse files
committed
Tests: fixed upstream resolver tests when run in parallel.
Renumbered TCP ports into the lower port range to avoid lock order reversal.
1 parent 0e52036 commit d69dedb

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

stream_upstream_resolver.t

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ stream {
8787
8888
EOF
8989

90-
$t->run_daemon(\&dns_daemon, $t, port($_), port($_ + 10)) for (8980 .. 8982);
90+
$t->run_daemon(\&dns_daemon, $t, port($_), port($_ - 500)) for (8980 .. 8982);
9191
$t->waitforfile($t->testdir . '/' . port($_)) for (8980 .. 8982);
9292

9393
$t->try_run('no resolver in upstream')->plan(6);
@@ -118,7 +118,7 @@ sub waitfordns {
118118

119119
IO::Socket::INET->new(
120120
Proto => 'tcp',
121-
PeerAddr => '127.0.0.1:' . port($port + 10)
121+
PeerAddr => '127.0.0.1:' . port($port - 500)
122122
)
123123
or die "Can't connect to dns control socket: $!\n";
124124
}

upstream_resolver.t

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ http {
7474
7575
EOF
7676

77-
$t->run_daemon(\&dns_daemon, $t, port($_), port($_ + 10)) for (8980 .. 8982);
77+
$t->run_daemon(\&dns_daemon, $t, port($_), port($_ - 500)) for (8980 .. 8982);
7878
$t->waitforfile($t->testdir . '/' . port($_)) for (8980 .. 8982);
7979

8080
$t->try_run('no resolver in upstream')->plan(6);
@@ -96,10 +96,9 @@ sub waitfordns {
9696

9797
sub sock {
9898
my ($port) = @_;
99-
10099
IO::Socket::INET->new(
101100
Proto => 'tcp',
102-
PeerAddr => '127.0.0.1:' . port($port + 10)
101+
PeerAddr => '127.0.0.1:' . port($port - 500)
103102
)
104103
or die "Can't connect to dns control socket: $!\n";
105104
}

0 commit comments

Comments
 (0)