Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Extend --test option to allow passing only a testcase #333

Merged
2 commits merged into from Nov 29, 2023
Merged

Extend --test option to allow passing only a testcase #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46d0d97
Extend --test option to pass only a test case
May 25, 2023
a2c380c
Update after review
Nov 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions lib/Zonemaster/CLI.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ has 'test' => (
isa => 'ArrayRef',
required => 0,
documentation => __(
'Specify test to run case-insensitively. Should be either the name of a module, or the name of a module and the name of a method in that module separated by a "/" character (Example: "Basic/basic01"). This switch can be repeated.'
'Specify test case to be run. Should be the case-insensitive name of a test module (e.g. "Delegation") and/or a test case (e.g. "Delegation/delegation01" or "delegation01"). This switch can be repeated.'
)
);

Expand Down Expand Up @@ -621,13 +621,24 @@ sub run {
# Actually run tests!
eval {
if ( $self->test and @{ $self->test } > 0 ) {
my $zone = Zonemaster::Engine->zone( $domain );
foreach my $t ( @{ $self->test } ) {
my ( $module, $method ) = split( '/', lc($t), 2 );
if ( $method ) {
Zonemaster::Engine->test_method( $module, $method, Zonemaster::Engine->zone( $domain ) );
# The case does not matter
$t = lc( $t );
# Fully qualified module and test case (e.g. Example/example12)
if (my ($module, $method) = $t =~ m#^ ( [a-z]+ ) / ( [a-z]+[0-9]{2} ) $#ix) {
Zonemaster::Engine->test_method( $module, $method, $zone );
}
# Just a test case (e.g. example12). Note the different capturing order.
elsif (($method, $module) = $t =~ m#^ ( ( [a-z]+ ) [0-9]{2} ) $#ix) {
Zonemaster::Engine->test_method( $module, $method, $zone );
tgreenx marked this conversation as resolved.
Show resolved Hide resolved
}
# Just a module name (e.g. Example) or something invalid.
# TODO: in case of invalid input, print a proper error message
# suggesting to use --list-tests for valid choices.
else {
Zonemaster::Engine->test_module( $module, $domain );
$t =~ s{/$}{};
Zonemaster::Engine->test_module( $t, $domain );
}
}
}
Expand Down
6 changes: 4 additions & 2 deletions script/zonemaster-cli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,12 +196,14 @@ Default: on

Print all test cases listed in the test modules, then exit.

=item --test=MODULE, --test=MODULE/TESTCASE
=item --test=MODULE, --test=MODULE/TESTCASE, --test=TESTCASE

Limit the testing suite to run only the specified tests.
This can be the name of a testing module, in which case all test cases from
that module will be run, or the name of a module followed by a slash and the
name of a test case (test case identifier) in that module.
name of a test case (test case identifier) in that module, or the name of the
test case.
Can be specified multiple times.
mattias-p marked this conversation as resolved.
Show resolved Hide resolved
This option is case-insensitive.

=item --stop_level=LEVEL, --stop-level=LEVEL
Expand Down