Factor the prefix cleaning logic in a new sanitize_prefix() helper

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

diff --git a/lib/VPIT/TestHelpers.pm b/lib/VPIT/TestHelpers.pm
index f00b94df47198bf8656af87751e160fe9af369b5..3225a1cd893dcb0277efff7d2fe9790ad10fc9cc 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,
@@ -622,7 +626,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;
   };
  }