Add CAPTURE_FAILED() and CAPTURE_PERL_FAILED()

[perl/modules/VPIT-TestHelpers.git] / lib / VPIT / TestHelpers.pm

diff --git a/lib/VPIT/TestHelpers.pm b/lib/VPIT/TestHelpers.pm
index f00b94df47198bf8656af87751e160fe9af369b5..0f37b40b6e3026eda9cb99dfb747276a4080aa71 100644 (file)
--- a/lib/VPIT/TestHelpers.pm
+++ b/lib/VPIT/TestHelpers.pm
@@ -29,6 +29,20 @@ sub export_to_pkg {
  return 1;
 }
 
+sub sanitize_prefix {
+ my $prefix = shift;
+
+ if (defined $prefix) {
+  if (length $prefix and $prefix !~ /_$/) {
+   $prefix .= '_';
+  }
+ } else {
+  $prefix = '';
+ }
+
+ return $prefix;
+}
+
 my %default_exports = (
  load_or_skip     => \&load_or_skip,
  load_or_skip_all => \&load_or_skip_all,
@@ -225,17 +239,7 @@ sub fresh_perl_env (&) {
 }
 
 sub init_run_perl {
- my $prefix = shift;
-
- if (defined $prefix) {
-  if (length $prefix and $prefix !~ /_$/) {
-   $prefix .= '_';
-  }
- } else {
-  $prefix = '';
- }
-
- my $p = $prefix;
+ my $p = sanitize_prefix(shift);
 
  return (
   run_perl              => \&run_perl,
@@ -264,7 +268,17 @@ sub run_perl {
 
 Import :
 
-    use VPIT::TestHelpers 'capture'
+    use VPIT::TestHelpers capture => [ $p ];
+
+where :
+
+=over 8
+
+=item -
+
+C<$p> is prefixed to the constants exported by this feature (defaults to C<''>).
+
+=back
 
 =item *
 
@@ -298,8 +312,16 @@ C<capture @command>
 
 =item -
 
+C<CAPTURE_FAILED $details> (possibly prefixed by C<$p>)
+
+=item -
+
 C<capture_perl $code>
 
+=item -
+
+C<CAPTURE_PERL_FAILED $details> (possibly prefixed by C<$p>)
+
 =back
 
 =back
@@ -307,6 +329,8 @@ C<capture_perl $code>
 =cut
 
 sub init_capture {
+ my $p = sanitize_prefix(shift);
+
  skip_all 'Cannot capture output on VMS' if $^O eq 'VMS';
 
  load_or_skip_all 'IO::Handle', '0', [ ];
@@ -317,8 +341,10 @@ sub init_capture {
  }
 
  return (
-  capture      => \&capture,
-  capture_perl => \&capture_perl,
+  capture                   => \&capture,
+  "${p}CAPTURE_FAILED"      => \&capture_failed_msg,
+  capture_perl              => \&capture_perl,
+  "${p}CAPTURE_PERL_FAILED" => \&capture_perl_failed_msg,
  );
 }
 
@@ -459,6 +485,15 @@ sub capture {
  }
 }
 
+sub capture_failed_msg {
+ my $details = shift;
+
+ my $msg = 'Could not capture command output';
+ $msg   .= " ($details)" if defined $details;
+
+ return $msg;
+}
+
 sub capture_perl {
  my $code = shift;
 
@@ -472,6 +507,15 @@ sub capture_perl {
  };
 }
 
+sub capture_perl_failed_msg {
+ my $details = shift;
+
+ my $msg = 'Could not capture perl output';
+ $msg   .= " ($details)" if defined $details;
+
+ return $msg;
+}
+
 =head2 C<threads>
 
 =over 4
@@ -622,7 +666,7 @@ sub init_usleep {
  } else {
   diag 'Using fallback usleep()';
   $usleep = sub {
-   my $s = int($_[0] / 2.5e5);
+   my $s = int($_[0] / 1e6);
    sleep $s if $s;
   };
  }