Attachment 309109 Details for Bug 441441 – Fix Patch :

[patch] Fix Patch :

bootparam.patch (text/plain), 4.44 KB, created by XINSUN on 2008-06-12 17:41:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: XINSUN

Created: 2008-06-12 17:41:03 UTC

Size: 4.44 KB

patch

obsolete

>Index: Bugzilla/Bug.pm
>===================================================================
>RCS file: /cvs/qa/hwcert/Bugzilla/Bug.pm,v
>retrieving revision 1.33
>diff -u -r1.33 Bug.pm
>--- Bugzilla/Bug.pm	29 Feb 2008 12:01:43 -0000	1.33
>+++ Bugzilla/Bug.pm	12 Jun 2008 17:32:05 -0000
>@@ -426,6 +426,7 @@
> $test{'rpm_name'} = $rpm_id_name{$test{'rpm_id'}};
> $test{'rpm_md5'} = $rpm_id_md5{$test{'rpm_id'}};
> $test{'rpm_attach_id'} = $rpm_id_attach_id{$test{'rpm_id'}};
>+ $test{'has_boot_param'} = "false"; #The flag indicate info test has an additional boot parameters.
> 
> push (@tests, \%test);
> }
>@@ -451,14 +452,29 @@
> $ref->{'hardware'} = \@hardware;
> 
> my @runs;
>- $query = "SELECT id, " . 
>+ $query = "SELECT id, results, " . 
> "(CASE WHEN test_wav IS NULL THEN NULL ELSE 1 END) as test_wav " .
> "FROM cert_runs WHERE test_id = $ref->{id} ORDER by id";
> $sth = $dbh->prepare($query);
> $sth->execute();
> while (my @row = $sth->fetchrow_array()) {
>- my %run;
>+ my %run;	
> $run{'id'} = shift @row;
>+
>+ #Detect whether info test result has an additional boot parameters
>+ if ($ref->{type} eq "INFO") {
>+ my $info_result = shift @row;
>+	 my @result_lines = split (/\n/, trim($info_result));
>+ foreach my $result_line (@result_lines) {
>+ if ($result_line =~ /^Boot Parameters:.+$/) { 
>+ $ref->{has_boot_param} = "true";
>+ last;
>+ }
>+ }
>+ } else {
>+ shift @row;
>+ }
>+
> if (@row) {
> $run{'test_wav'} = shift @row;
> }
>Index: Bugzilla/Template.pm
>===================================================================
>RCS file: /cvs/qa/hwcert/Bugzilla/Template.pm,v
>retrieving revision 1.3
>diff -u -r1.3 Template.pm
>--- Bugzilla/Template.pm	21 Sep 2007 14:13:23 -0000	1.3
>+++ Bugzilla/Template.pm	12 Jun 2008 17:32:06 -0000
>@@ -338,7 +338,19 @@
> 		$var =~ s/succeed.*?\b/$&<\/span>/ig;
> 		$var =~ s/pass.*?\b/$&<\/span>/ig;
> 		$var =~ s/notice.*?\b/$&<\/span>/ig;
>-		$var =~ s/note.*?\b/$&<\/span>/ig;
>+		$var =~ s/note\W?\b/$&<\/span>/ig;
>+
>+ #Highlight Additional Boot Parameters except the default value: "ro root=LABEL=/ rhgb quiet"
>+ if ($var =~/Boot Parameters: (.*)?\b/){
>+	 my $boot_param_line = $1;
>+ my @params = split (/\s/, $boot_param_line);
>+ foreach my $param (@params) {
>+ if($param ne "ro" && $param ne "rhgb" && $param ne "quiet" && $param !~ /root=.*/) { 
>+ $var =~ s/$param/$&<\/span>/ig; 
>+ } 
>+ }
>+ }
>+
> return $var;
> },
>Index: template/en/default/bug/packages_data.html.tmpl
>===================================================================
>RCS file: /cvs/qa/hwcert/template/en/default/bug/packages_data.html.tmpl,v
>retrieving revision 1.3
>diff -u -r1.3 packages_data.html.tmpl
>--- template/en/default/bug/packages_data.html.tmpl	6 Mar 2008 03:24:16 -0000	1.3
>+++ template/en/default/bug/packages_data.html.tmpl	12 Jun 2008 17:32:06 -0000
>@@ -76,12 +76,16 @@
> [% statusicon = "icon_checkin.gif" %] [% # default to unknown %]
> [% IF t.status == "FAILED" %][% statusicon = "rhn-listicon-error.gif" %] [% END %]
> [% IF t.status == "PASSED" %][% statusicon = "rhn-listicon-ok.gif" %] [% END %]
>+ [% IF t.has_boot_param == "true" %][% statusicon = "icon_checkin.gif" %] [% END %]
> <img style="vertical-align:middle;" src="images/[% statusicon FILTER html %]" alt="[% t.status %]">
> 
> [% FOREACH r = t.runs %]
> [% t.status FILTER html IF t.runs.size == 0 %]
> <a href="results.cgi?cert_id=[% bug.bug_id FILTER url_quote %]&id=[% r.id FILTER url_quote %]"
> title="Click for results.">[% t.status %]</a>
>+ [% IF t.has_boot_param == "true" %]
>+ &nbsp;(Boot Parameter) 
>+ [% END %]
> [% END %]</td>
> 
> <td align="center">

Actions: View | Diff

Attachments on bug 441441: 309109 | 312316