[Jifty-commit] jifty branch, master, updated. 1.10518-53-gcbfa4c0
Jifty commits
jifty-commit at lists.jifty.org
Mon Oct 24 13:35:43 EDT 2011
The branch, master has been updated
via cbfa4c0247ae33795fbbf8da8cbe0a5980d96aa8 (commit)
via 8be3cb6f9b09fc76b01865cf2083324983eae6db (commit)
from e6ed3d3074019a330222835db6583872a846f358 (commit)
Summary of changes:
lib/Jifty/Test/WWW/Selenium.pm | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
- Log -----------------------------------------------------------------
commit 8be3cb6f9b09fc76b01865cf2083324983eae6db
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Mon Oct 24 13:34:19 2011 -0400
Quiet down 'diag' statements when we're not running in verbose mode
diff --git a/lib/Jifty/Test/WWW/Selenium.pm b/lib/Jifty/Test/WWW/Selenium.pm
index f2b944b..9cef93e 100644
--- a/lib/Jifty/Test/WWW/Selenium.pm
+++ b/lib/Jifty/Test/WWW/Selenium.pm
@@ -70,7 +70,9 @@ sub rc_ok {
while ($try--) {
$sel = eval { $args{selenium_class}->new( %args, auto_stop => 0 ) };
last if $sel;
- Test::More::diag "waiting for selenium rc...";
+ if ($ENV{'TEST_VERBOSE'}) {
+ Test::More::diag "waiting for selenium rc...";
+ }
sleep 3;
}
@@ -119,7 +121,9 @@ sub _start_src {
}
$ENV{LANG} = $args{lang} || 'en_US.UTF-8';
$ENV{PATH} = "$ENV{PATH}:/usr/lib/firefox:/usr/lib/mozilla-firefox";
- Test::More::diag "start selenium rc [$$]";
+ if ($ENV{'TEST_VERBOSE'}) {
+ Test::More::diag "start selenium rc [$$]";
+ }
local $SIG{CHLD} = \&_REAPER;
local $SIG{TERM} = sub { exit 0 };
eval { Alien::SeleniumRC::start(@{ $args{args} || [] }) };
@@ -127,7 +131,9 @@ sub _start_src {
Test::More::diag "selenium rc [$$] failed to start: $@";
exit 1;
} else {
- Test::More::diag "selenium rc [$$] finished.";
+ if ($ENV{'TEST_VERBOSE'}) {
+ Test::More::diag "selenium rc [$$] finished.";
+ }
exit;
}
}
commit cbfa4c0247ae33795fbbf8da8cbe0a5980d96aa8
Author: Jesse Vincent <jesse at bestpractical.com>
Date: Mon Oct 24 13:34:43 2011 -0400
Force selenium tests to run with a standalone server, rather than an
inline one
diff --git a/lib/Jifty/Test/WWW/Selenium.pm b/lib/Jifty/Test/WWW/Selenium.pm
index 9cef93e..79c2df4 100644
--- a/lib/Jifty/Test/WWW/Selenium.pm
+++ b/lib/Jifty/Test/WWW/Selenium.pm
@@ -101,6 +101,7 @@ my @cleanup;
sub _start_src {
my ($self, %args) = @_;
+ $ENV{'JIFTY_TEST_SERVER'} = 'Standalone';
eval 'require Alien::SeleniumRC; 1'
or die 'requires Alien::SeleniumRC to start selenium-rc.';
-----------------------------------------------------------------------
More information about the Jifty-commit
mailing list