Skip to content

Commit 57580e8

Browse files
committed
fix nameserver testcase
1 parent 04baff4 commit 57580e8

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

tests/nginx-tests/tengine-tests/dynamic_resolve.t

+4-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ BEGIN { use FindBin; chdir($FindBin::Bin); }
1616

1717
use lib 'lib';
1818
use Test::Nginx;
19-
eval { require Net::DNS::Nameserver; };
2019
plan(skip_all => 'Net::DNS::Nameserver not installed') if $@;
2120

2221
###############################################################################
@@ -148,7 +147,7 @@ kill $^O eq 'MSWin32' ? 9 : 'TERM', $dns_pid;
148147
wait;
149148

150149
# wait for dns cache to expire
151-
sleep(2);
150+
sleep(3);
152151

153152
unlike(http_get('/stale'), qr/127\.0\.0\.2/,
154153
'stale http server should be www.taobao.com:8081, using initial result');
@@ -251,14 +250,16 @@ sub reply_handler {
251250
}
252251

253252
sub dns_server_daemon {
253+
eval { require Net::DNS::Nameserver; };
254+
254255
my $ns = new Net::DNS::Nameserver(
255256
LocalAddr => '127.0.0.1',
256257
LocalPort => 53530,
257258
ReplyHandler => \&reply_handler,
258259
Verbose => 0
259260
) or die "couldn't create nameserver object\n";
260261

261-
$ns->main_loop;
262+
$ns->start_server(1);
262263
}
263264

264265
###############################################################################

tests/nginx-tests/tengine-tests/vnswrr4dynamic_ups.t

+4-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ BEGIN { use FindBin; chdir($FindBin::Bin); }
1515

1616
use lib 'lib';
1717
use Test::Nginx;
18-
eval { require Net::DNS::Nameserver; };
1918
plan(skip_all => 'Net::DNS::Nameserver not installed') if $@;
2019

2120
###############################################################################
@@ -153,7 +152,7 @@ kill $^O eq 'MSWin32' ? 9 : 'TERM', $dns_pid;
153152
wait;
154153

155154
# wait for dns cache to expire
156-
sleep(2);
155+
sleep(3);
157156

158157
unlike(http_get('/stale'), qr/127\.0\.0\.2/,
159158
'stale http server should be www.taobao.com:8081, using initial result');
@@ -248,14 +247,16 @@ sub reply_handler {
248247
}
249248

250249
sub dns_server_daemon {
250+
eval { require Net::DNS::Nameserver; };
251+
251252
my $ns = new Net::DNS::Nameserver(
252253
LocalAddr => '127.0.0.1',
253254
LocalPort => 53530,
254255
ReplyHandler => \&reply_handler,
255256
Verbose => 0
256257
) or die "couldn't create nameserver object\n";
257258

258-
$ns->main_loop;
259+
$ns->start_server(1);
259260
}
260261

261262
###############################################################################

0 commit comments

Comments
 (0)