You are viewing a plain text version of this content. The canonical link for it is here.
Posted to test-commits@perl.apache.org by ph...@apache.org on 2010/04/22 23:37:05 UTC

svn commit: r937073 - in /perl/Apache-Test/trunk: Changes lib/Apache/TestRun.pm

Author: phred
Date: Thu Apr 22 21:37:05 2010
New Revision: 937073

URL: http://svn.apache.org/viewvc?rev=937073&view=rev
Log:
Skip the interactive prompt if the AUTOMATED_TESTING environment variable
is set.  This should resolve some CPANtesters failures.

Modified:
    perl/Apache-Test/trunk/Changes
    perl/Apache-Test/trunk/lib/Apache/TestRun.pm

Modified: perl/Apache-Test/trunk/Changes
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/Changes?rev=937073&r1=937072&r2=937073&view=diff
==============================================================================
--- perl/Apache-Test/trunk/Changes (original)
+++ perl/Apache-Test/trunk/Changes Thu Apr 22 21:37:05 2010
@@ -8,11 +8,15 @@ Changes - Apache::Test change logfile
 
 =item 1.33-dev
 
+Add check for automated testing environment variable before prompting
+with EU::MM to quit the test suite.  Some automated smoke tests were
+failed because the EU::MM prompt was timing out.
+[Adam Prime, Fred Moyer]
+
 https://rt.cpan.org/Public/Bug/Display.html?id=32993
 use TAP::Harness for Apache::TestHarnessPHP
 [Mark A. Hershberger]
 
-
 https://rt.cpan.org/Public/Bug/Display.html?id=54476
 Fix error where non root user gets test failure with httpd suexec and mod_fcgid
 [Peter (Stig) Edwards]

Modified: perl/Apache-Test/trunk/lib/Apache/TestRun.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestRun.pm?rev=937073&r1=937072&r2=937073&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestRun.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestRun.pm Thu Apr 22 21:37:05 2010
@@ -1311,8 +1311,10 @@ sub skip_test_suite {
 
     # we can't prompt when STDIN is not attached to tty, unless we
     # were told that's it OK via env var (in which case some program
-    # will feed the interactive prompts
-    unless (-t STDIN || $ENV{APACHE_TEST_INTERACTIVE_PROMPT_OK}) {
+    # will feed the interactive prompts).  Also skip the prompt if the
+    # automated testing environment variable is set.
+    unless (-t STDIN || $ENV{APACHE_TEST_INTERACTIVE_PROMPT_OK}
+                     || !$ENV{AUTOMATED_TESTING} ) {
         $no_doubt = 1;
     }