stas 2003/12/19 01:12:12
Modified: perl-framework/Apache-Test/lib/Apache TestRun.pm Log: if the test suite was aborted because of a user-error we don't want to call the bugreport and invite users to submit a bug report - after all it's a user error. but we still want the program to fail, so add an accessor to set/read this flag. bugreport will run the report sub only if the test suite has failed and this flag is not on.
As we added the bugreport facility we have forgotten that some of the failures are user-errors and inviting users to submit a bug report is plain wrong. So I've added a possible solution for the running as root problem as I don't want us to get flooded with reports, which we can't do much about and the diagnosis message is already pretty clear.
There are a few other user errors that we need to raise this flag, to avoid the bugreport banner.
Feel free to suggest a different way to handle this issue, it's an internal change and shouldn't affect users.
Revision Changes Path
1.129 +16 -3 httpd-test/perl-framework/Apache-Test/lib/Apache/TestRun.pm
Index: TestRun.pm
===================================================================
RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestRun.pm,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -u -r1.128 -r1.129
--- TestRun.pm 16 Dec 2003 21:03:44 -0000 1.128
+++ TestRun.pm 19 Dec 2003 09:12:12 -0000 1.129
@@ -67,6 +67,17 @@
$^X = $Config{perlpath} unless -e $^X;
}
+# if the test suite was aborted because of a user-error we don't want
+# to call the bugreport and invite users to submit a bug report -
+# after all it's a user error. but we still want the program to fail,
+# so raise this flag in such a case.
+my $user_error = 0;
+sub user_error {
+ my $self = shift;
+ $user_error = shift if @_;
+ $user_error;
+}
+
sub new {
my $class = shift;
@@ -322,8 +333,8 @@
sub try_bug_report {
my $self = shift;
- if ($? && $self->{opts}->{bugreport} && - $self->can('bug_report')) {
+ if ($? && !$self->user_error &&
+ $self->{opts}->{bugreport} && $self->can('bug_report')) {
$self->bug_report;
}
}
@@ -869,8 +880,9 @@
my $res = qx[$check] || '';
warning "result: $res";
unless ($res eq 'OK') {
+ $self->user_error(1);
#$self->restore_t_perms;
- error(<<"EOI") && die "\n";
+ error <<"EOI";
You are running the test suite under user 'root'.
Apache cannot spawn child processes as 'root', therefore
we attempt to run the test suite with user '$user' ($uid:$gid).
@@ -889,6 +901,7 @@
% $check
from that directory.
EOI
+ exit_perl 0;
}
}
__________________________________________________________________ Stas Bekman JAm_pH ------> Just Another mod_perl Hacker http://stason.org/ mod_perl Guide ---> http://perl.apache.org mailto:[EMAIL PROTECTED] http://use.perl.org http://apacheweek.com http://modperlbook.org http://apache.org http://ticketmaster.com
