Remove significance of some test envvars (and add a test to trip up downstream packagers)

diff --git a/t/50fork.t b/t/50fork.t
index 8fea72f..40d8655 100644 (file)
--- a/t/50fork.t
+++ b/t/50fork.t
@@ -2,18 +2,14 @@ use strict;
 use warnings;
 use Test::More;
 
-# README: If you set the env var to a number greater than 10,
-#   we will use that many children
-
 my ($dsn, $user, $pass) = @ENV{map { "DBICTEST_PG_${_}" } qw/DSN USER PASS/};
-my $num_children = $ENV{DBICTEST_FORK_STRESS};
-
-plan skip_all => 'Set $ENV{DBICTEST_FORK_STRESS} to run this test'
-    unless $num_children;
 
 plan skip_all => 'Set $ENV{DBICTEST_PG_DSN}, _USER and _PASS to run this test'
       . ' (note: creates and drops a table named artist!)' unless ($dsn && $user);
 
+# README: If you set the env var to a number greater than 10,
+#   we will use that many children
+my $num_children = $ENV{DBICTEST_FORK_STRESS} || 1;
 if($num_children !~ /^[0-9]+$/ || $num_children < 10) {
    $num_children = 10;
 }

diff --git a/t/51threads.t b/t/51threads.t
index 14d74e3..8a1ed57 100644 (file)
--- a/t/51threads.t
+++ b/t/51threads.t
@@ -24,11 +24,7 @@ plan skip_all => 'Set $ENV{DBICTEST_PG_DSN}, _USER and _PASS to run this test'
 
 # README: If you set the env var to a number greater than 10,
 #   we will use that many children
-my $num_children = $ENV{DBICTEST_THREAD_STRESS};
-
-plan skip_all => 'Set $ENV{DBICTEST_THREAD_STRESS} to run this test'
-    unless $num_children;
-
+my $num_children = $ENV{DBICTEST_THREAD_STRESS} || 1;
 if($num_children !~ /^[0-9]+$/ || $num_children < 10) {
    $num_children = 10;
 }

diff --git a/t/51threadtxn.t b/t/51threadtxn.t
index 4c218d0..e368771 100644 (file)
--- a/t/51threadtxn.t
+++ b/t/51threadtxn.t
@@ -25,10 +25,7 @@ plan skip_all => 'Set $ENV{DBICTEST_PG_DSN}, _USER and _PASS to run this test'
       . ' (note: creates and drops a table named artist!)' unless ($dsn && $user);
 
 
-my $num_children = $ENV{DBICTEST_THREAD_STRESS};
-plan skip_all => 'Set $ENV{DBICTEST_THREAD_STRESS} to run this test'
-    unless $num_children;
-
+my $num_children = $ENV{DBICTEST_THREAD_STRESS} || 1;
 if($num_children !~ /^[0-9]+$/ || $num_children < 10) {
    $num_children = 10;
 }

diff --git a/xt/old_envvars.t b/xt/old_envvars.t
new file mode 100644 (file)
index 0000000..8764e87
--- /dev/null
+++ b/xt/old_envvars.t
@@ -0,0 +1,28 @@
+use warnings;
+use strict;
+
+use Test::More;
+
+my @defined = grep { $ENV{$_} } qw/
+  DATA_DUMPER_TEST
+  DBICTEST_STORAGE_STRESS
+  DBICTEST_FORK_STRESS
+  DBICTEST_THREAD_STRESS
+/;
+
+$SIG{ALRM} = sub { die "\n\nENVCHECK prompt timeout\n\n\n" };
+if (@defined) {
+  diag join "\n",
+    'The following ENV variables used to control the test suite, '
+   .'but no longer do so, please remove them from your environment',
+    @defined,
+    '',
+    '(press Enter to continue)',
+  ;
+  alarm(10);
+  <>;
+  alarm(0);
+}
+ok(1);
+
+done_testing;