Skip to content

Commit f4c2f07

Browse files
committed
Tests: cleanup unused imports.
Do not set certificate validity unless necessary.
1 parent a07249a commit f4c2f07

File tree

9 files changed

+2
-28
lines changed

9 files changed

+2
-28
lines changed

t/acme_conf_certificate.t

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ use strict;
1414

1515
use Test::More;
1616

17-
use IO::Select;
18-
1917
BEGIN { use FindBin; chdir($FindBin::Bin); }
2018

2119
use lib 'lib';

t/acme_conf_issuer.t

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ use strict;
1414

1515
use Test::More;
1616

17-
use IO::Select;
18-
1917
BEGIN { use FindBin; chdir($FindBin::Bin); }
2018

2119
use lib 'lib';

t/acme_http.t

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ use strict;
1414

1515
use Test::More;
1616

17-
use IO::Select;
18-
1917
BEGIN { use FindBin; chdir($FindBin::Bin); }
2018

2119
use lib 'lib';
@@ -98,10 +96,8 @@ my $acme = Test::Nginx::ACME->new($t, port(9000), port(9001),
9896
$t->testdir . '/acme.test.crt',
9997
$t->testdir . '/acme.test.key',
10098
http_port => port(8080),
101-
tls_port => port(8443),
10299
dns_port => $dp,
103100
nosleep => 1,
104-
validity => 60,
105101
);
106102

107103
$t->run_daemon(\&Test::Nginx::DNS::dns_test_daemon, $t, $dp, \@dc);

t/acme_key_type.t

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ use strict;
1414

1515
use Test::More;
1616

17-
use IO::Select;
18-
1917
BEGIN { use FindBin; chdir($FindBin::Bin); }
2018

2119
use lib 'lib';
@@ -114,10 +112,8 @@ my $acme = Test::Nginx::ACME->new($t, port(9000), port(9001),
114112
$t->testdir . '/acme.test.crt',
115113
$t->testdir . '/acme.test.key',
116114
http_port => port(8080),
117-
tls_port => port(8443),
118115
dns_port => $dp,
119116
nosleep => 1,
120-
validity => 60,
121117
);
122118

123119
$t->run_daemon(\&Test::Nginx::DNS::dns_test_daemon, $t, $dp, \@dc);

t/acme_multiple_issuers.t

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ use strict;
1414

1515
use Test::More;
1616

17-
use IO::Select;
18-
1917
BEGIN { use FindBin; chdir($FindBin::Bin); }
2018

2119
use lib 'lib';
@@ -116,7 +114,6 @@ my $acme1 = Test::Nginx::ACME->new($t, port(9000), port(9001),
116114
$t->testdir . '/acme.test.crt',
117115
$t->testdir . '/acme.test.key',
118116
http_port => port(8080),
119-
tls_port => port(8443),
120117
dns_port => $dp,
121118
nosleep => 1,
122119
state => $t->testdir . '/first',
@@ -126,7 +123,6 @@ my $acme2 = Test::Nginx::ACME->new($t, port(9002), port(9003),
126123
$t->testdir . '/acme.test.crt',
127124
$t->testdir . '/acme.test.key',
128125
http_port => port(8080),
129-
tls_port => port(8443),
130126
dns_port => $dp,
131127
nosleep => 1,
132128
state => $t->testdir . '/second',

t/acme_reload.t

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ use strict;
1414

1515
use Test::More;
1616

17-
use IO::Select;
18-
1917
BEGIN { use FindBin; chdir($FindBin::Bin); }
2018

2119
use lib 'lib';
@@ -98,7 +96,6 @@ my $acme = Test::Nginx::ACME->new($t, port(9000), port(9001),
9896
$t->testdir . '/acme.test.crt',
9997
$t->testdir . '/acme.test.key',
10098
http_port => port(8080),
101-
tls_port => port(8443),
10299
dns_port => $dp,
103100
nosleep => 1,
104101
);

t/acme_renewal.t

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ use strict;
1414

1515
use Test::More;
1616

17-
use IO::Select;
18-
1917
BEGIN { use FindBin; chdir($FindBin::Bin); }
2018

2119
use lib 'lib';
@@ -98,7 +96,6 @@ my $acme = Test::Nginx::ACME->new($t, port(9000), port(9001),
9896
$t->testdir . '/acme.test.crt',
9997
$t->testdir . '/acme.test.key',
10098
http_port => port(8080),
101-
tls_port => port(8443),
10299
dns_port => $dp,
103100
nosleep => 1,
104101
validity => 30,

t/acme_ssl_verify.t

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ use strict;
1414

1515
use Test::More;
1616

17-
use IO::Select;
18-
1917
BEGIN { use FindBin; chdir($FindBin::Bin); }
2018

2119
use lib 'lib';
@@ -95,10 +93,8 @@ my $acme = Test::Nginx::ACME->new($t, port(9000), port(9001),
9593
$t->testdir . '/acme.test.crt',
9694
$t->testdir . '/acme.test.key',
9795
http_port => port(8080),
98-
tls_port => port(8443),
9996
dns_port => $dp,
10097
nosleep => 1,
101-
validity => 60,
10298
);
10399

104100
$t->run_daemon(\&Test::Nginx::DNS::dns_test_daemon, $t, $dp, \@dc);

t/lib/Test/Nginx/ACME.pm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ sub new {
2828

2929
$t->has_daemon($PEBBLE);
3030

31-
my $http_port = $extra{http_port} || Test::Nginx::port(8080);
32-
my $tls_port = $extra{tls_port} || Test::Nginx::port(8443);
31+
my $http_port = $extra{http_port} || 80;
32+
my $tls_port = $extra{tls_port} || 443;
3333
my $validity = $extra{validity} || 3600;
3434

3535
$self->{dns_port} = $extra{dns_port} || Test::Nginx::port(8980, udp=>1);

0 commit comments

Comments
 (0)