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

Process raw TAP output from STDIN #83

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Process raw TAP output from STDIN #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
05d7f42
Process raw TAP output from STDIN
timgimyee Oct 28, 2018
8302f9b
Check for `ok` and `not ok` test lines as well as `1..N` plan line
timgimyee Oct 29, 2018
2dd1146
Check for TAP version line, comments, and subtests
timgimyee Oct 29, 2018
a2047d2
Match plan line with more than 9 tests
timgimyee Oct 30, 2018
6c5cef4
Add --stdin=list|tap to explicitly set STDIN to list of tests or raw …
timgimyee Oct 30, 2018
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
19 changes: 19 additions & 0 deletions bin/prove
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ Options that take arguments:
--statefile=file Use `file` instead of `.prove` for state
--rc=rcfile Process options from rcfile
--rules Rules for parallel vs sequential processing.
--stdin=list|tap STDIN is list of tests or raw TAP output.

=head1 NOTES

Expand Down Expand Up @@ -103,6 +104,24 @@ file, you can add them to your tests by using a '-':

See the C<README> in the C<examples> directory of this distribution.

If you have raw TAP output in a file, you can likewise add them to
your tests by using a '-':

prove - < my_raw_tap_output.txt

Or from a command:

ruby test.rb | prove -

Use the C<--stdin> switch to explicitly set C<STDIN> to a list of
tests:

prove --stdin=list - < my_list_of_things_to_test.txt

Or raw TAP output:

ruby test.rb | prove --stdin=tap -

=head2 Default Test Directory

If no files or directories are supplied, C<prove> looks for all files
Expand Down
7 changes: 5 additions & 2 deletions lib/App/Prove.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ BEGIN {
@ATTR = qw(
archive argv blib show_count color directives exec failures comments
formatter harness includes modules plugins jobs lib merge parse quiet
really_quiet recurse backwards shuffle taint_fail taint_warn timer
really_quiet recurse stdin backwards shuffle taint_fail taint_warn timer
verbose warnings_fail warnings_warn show_help show_man show_version
state_class test_args state dry extensions ignore_exit rules state_manager
normalize sources tapversion trap
Expand Down Expand Up @@ -220,6 +220,7 @@ sub process_args {
'source=s@' => $self->{sources},
'formatter=s' => \$self->{formatter},
'r|recurse' => \$self->{recurse},
'stdin=s' => \$self->{stdin},
'reverse' => \$self->{backwards},
'p|parse' => \$self->{parse},
'q|quiet' => \$self->{quiet},
Expand Down Expand Up @@ -519,7 +520,7 @@ sub _get_tests {
$state->apply_switch(@$state_switch);
}

my @tests = $state->get_tests( $self->recurse, @{ $self->argv } );
my @tests = $state->get_tests( $self, @{ $self->argv } );

$self->_shuffle(@tests) if $self->shuffle;
@tests = reverse @tests if $self->backwards;
Expand Down Expand Up @@ -723,6 +724,8 @@ calling C<run>.

=item C<state_class>

=item C<stdin>

=item C<taint_fail>

=item C<taint_warn>
Expand Down
50 changes: 41 additions & 9 deletions lib/App/Prove/State.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,11 +313,13 @@ Given a list of args get the names of tests that should run
=cut

sub get_tests {
my $self = shift;
my $recurse = shift;
my @argv = @_;
my $self = shift;
my $app = shift;
my @argv = @_;
my %seen;

my $recurse = ref $app ? $app->recurse : $app;

my @selected = $self->_query;

unless ( @argv || @{ $self->{select} } ) {
Expand All @@ -326,7 +328,7 @@ sub get_tests {
unless -d $argv[0];
}

push @selected, $self->_get_raw_tests( $recurse, @argv ) if @argv;
push @selected, $self->_get_raw_tests( $app, @argv ) if @argv;
return grep { !$seen{$_}++ } @selected;
}

Expand Down Expand Up @@ -374,11 +376,14 @@ sub _query_clause {
}

sub _get_raw_tests {
my $self = shift;
my $recurse = shift;
my @argv = @_;
my $self = shift;
my $app = shift;
my @argv = @_;
my @tests;

my $recurse = ref $app ? $app->recurse : $app;
my $stdin = ref $app && $app->stdin || '';

# Do globbing on Win32.
if (NEED_GLOB) {
eval "use File::Glob::Windows"; # [49732]
Expand All @@ -388,8 +393,35 @@ sub _get_raw_tests {

for my $arg (@argv) {
if ( '-' eq $arg ) {
push @argv => <STDIN>;
chomp(@argv);
local $/;
my $in = <STDIN>;
if (
$stdin eq 'tap'
or !$stdin && $in =~ /
\A # Beginning of first line
TAP\s+version\s+\d+ # TAP version line
|
^ # Beginning of any line
\s* # Indented subtests
(?:
[#] # A comment
|
(?:
1\.\.\d+ | # A plan line
ok | # A test line - pass
not\s+ok # A test line - fail
)
\b # End of word or number
(?!\S) # Space if anything else on line
)
/xm
) {
# Raw TAP output.
push @tests => [$in, '*STDIN'];
} else {
# List of tests.
push @argv => split /\n/, $in;
}
next;
}

Expand Down
153 changes: 146 additions & 7 deletions t/prove.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ BEGIN { # START PLAN
@ATTR = qw(
archive argv blib color directives exec extensions failures
formatter harness includes lib merge parse quiet really_quiet
recurse backwards shuffle taint_fail taint_warn verbose
recurse stdin backwards shuffle taint_fail taint_warn verbose
warnings_fail warnings_warn
);

Expand Down Expand Up @@ -116,8 +116,9 @@ BEGIN { # START PLAN
},
{ name => 'Set all options via constructor',
args => {
archive => 1,
archive => 0,
argv => [qw(one two three)],
backwards => 1,
blib => 2,
color => 3,
directives => 4,
Expand All @@ -132,17 +133,18 @@ BEGIN { # START PLAN
quiet => 14,
really_quiet => 15,
recurse => 16,
backwards => 17,
shuffle => 18,
shuffle => 17,
stdin => 18,
taint_fail => 19,
taint_warn => 20,
verbose => 21,
warnings_fail => 22,
warnings_warn => 23,
},
expect => {
archive => 1,
archive => 0,
argv => [qw(one two three)],
backwards => 1,
blib => 2,
color => 3,
directives => 4,
Expand All @@ -157,8 +159,8 @@ BEGIN { # START PLAN
quiet => 14,
really_quiet => 15,
recurse => 16,
backwards => 17,
shuffle => 18,
shuffle => 17,
stdin => 18,
taint_fail => 19,
taint_warn => 20,
verbose => 21,
Expand Down Expand Up @@ -1458,6 +1460,140 @@ BEGIN { # START PLAN
# ],
# },


# STDIN
{ name => 'STDIN (file names)',
stdin => "uno\ndos\ntres\n",
args => {
argv => ['-'],
},
expect => {
argv => ['-'],
},
runlog => [
[ '_runtests',
{ verbosity => 0, show_count => 1 },
'uno', 'dos', 'tres'
]
],
},
(map +{
name => "STDIN (file - $_)",
stdin => "$_\ndos\ntres\n",
args => {
argv => ['-'],
},
expect => {
argv => ['-'],
},
runlog => [
[ '_runtests',
{ verbosity => 0, show_count => 1 },
$_, 'dos', 'tres',
]
],
} => split /\n/, <<'FILES'
1..2.t
1..2a
ok.t
okay
OK
not ok.t
not oklahoma
NOT OK
FILES
),
(map +{
name => "STDIN (TAP - $_)",
stdin => "\n$_\n",
args => {
argv => ['-'],
},
expect => {
argv => ['-'],
},
runlog => [
[ '_runtests',
{ verbosity => 0, show_count => 1 },
["\n$_\n", '*STDIN'],
]
],
} => split /\n/, <<'TAP'
1..42
1..4 # Skipped: Win32 not supported
ok
ok 2
not ok
not ok 3
# comment
1..4
1..4 # Skipped: Win32 not supported
ok
ok 2
not ok
not ok 3
# comment
TAP
),
{
name => "STDIN (TAP - TAP version 13)",
stdin => "TAP version 13\n",
args => {
argv => ['-'],
},
expect => {
argv => ['-'],
},
runlog => [
[ '_runtests',
{ verbosity => 0, show_count => 1 },
["TAP version 13\n", '*STDIN'],
]
],
},
(map +{
name => 'Switch --stdin=list',
stdin => $_,
switches => [ '--stdin=list', '-' ],
expect => {
stdin => 'list',
},
runlog => [
[ '_runtests',
{ verbosity => 0, show_count => 1 },
split /\n/
]
],
} => <<'NOT_TAP'
TAP version 13
1..4
# comment
ok 1
ok 2
not ok 3
not ok 4
NOT_TAP
),
(map +{
name => 'Switch --stdin=tap',
stdin => $_,
switches => [ '--stdin=tap', '-' ],
expect => {
stdin => 'tap',
},
runlog => [
[ '_runtests',
{ verbosity => 0, show_count => 1 },
[$_, '*STDIN'],
]
],
} => <<'NOT_LIST'
alpha.t
beta.t
charlie.t
NOT_LIST
),

);

# END SCHEDULE
Expand Down Expand Up @@ -1536,6 +1672,9 @@ for my $test (@SCHEDULE) {
}

if ( my $runlog = $test->{runlog} ) {
local *STDIN;
open STDIN, '<', \$test->{stdin} or die "No open STDIN: $!"
if $test->{stdin};
eval { $app->run };
if ( my $err_pattern = $test->{run_error} ) {
like $@, $err_pattern, "$name: expected error OK";
Expand Down