Attachment 314173 Details for Bug 457515 – Patch Fix:

[patch] Patch Fix:

info_test.patch (text/plain), 7.68 KB, created by XINSUN on 2008-08-13 07:18:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: XINSUN

Created: 2008-08-13 07:18:11 UTC

Size: 7.68 KB

patch

obsolete

>Index: Bugzilla/Bug.pm
>===================================================================
>RCS file: /cvs/qa/hwcert/Bugzilla/Bug.pm,v
>retrieving revision 1.39
>diff -u -r1.39 Bug.pm
>--- Bugzilla/Bug.pm	31 Jul 2008 20:10:36 -0000	1.39
>+++ Bugzilla/Bug.pm	13 Aug 2008 07:12:30 -0000
>@@ -356,16 +356,20 @@
> 		      my %test_result;
> 		      $test_result{'test_id'} = $test_id;
>                       $test_result{'status'} = $test_status;
>-		      $query="SELECT status,rep_platform FROM cert_tests WHERE test_type = 'INFO' and rpm_id = $test_rpm_id and iteration = $test_iteration and cert_id = $cid"; 
>+		      $query="SELECT id,status,rep_platform FROM cert_tests WHERE test_type = 'INFO' and rpm_id = $test_rpm_id and iteration = $test_iteration and cert_id = $cid"; 
>                       my $sth = $dbh->prepare($query);
>                       $sth->execute();
>-	              my ($info_status,$rep_platform) = $sth->fetchrow_array();
>+	              my ($info_test_id,$info_status,$rep_platform) = $sth->fetchrow_array();
>+
>+                      $test_result{'info_test_id'} = $info_test_id;
>                       $test_result{'info_status'} = $info_status;
>+
> 		      if ($rep_platform =~ /64/) {
> 		          $test_result{'bits'} = 64; 
>                       }else{
> 		          $test_result{'bits'} = 32; 
>                       }
>+
>                       
>                       if ($test_result{'bits'} == 64 && $testplanbox{'required_64bits'} == 0) {
>                           #If not required 64bit test, then next and incase the cost of parsing hardware. 
>@@ -376,6 +380,13 @@
>                           #If not required 32bit test, then next and incase the cost of parsing hardware.
> 			  next;
>                       }
>+                        
>+                      #Get info test's hardware_id.
>+                      $query="SELECT id FROM cert_hardware WHERE test_id = " . $test_result{'info_test_id'}; 
>+		      my $sth = $dbh->prepare($query);
>+    	              $sth->execute();
>+    		      my $info_hardware_id = $sth->fetchrow_array();
>+                      $test_result{'info_hardware_id'} = $info_hardware_id; 
> 
>                       #Get hardware_id and hardware_desc for the cert test.
> 		      $query="SELECT id, hardware FROM cert_hardware WHERE test_id= $test_id";
>@@ -414,7 +425,13 @@
> 		              }   
>                           }   
> 		     }
>-		      
>+
>+                      #Get info test's result_id.
>+                      $query="SELECT id FROM cert_runs WHERE test_id = " . $test_result{'info_test_id'}; 
>+                      my $sth = $dbh->prepare($query);
>+                      $sth->execute();
>+                      my $info_result_id = $sth->fetchrow_array();
>+                      $test_result{'info_result_id'} = $info_result_id;
> 
>                       #Get result_info for the cert test
> 		      $query="SELECT id FROM cert_runs WHERE test_id=$test_id";
>Index: template/en/default/bug/testplan_with_class.html.tmpl
>===================================================================
>RCS file: /cvs/qa/hwcert/template/en/default/bug/testplan_with_class.html.tmpl,v
>retrieving revision 1.3
>diff -u -r1.3 testplan_with_class.html.tmpl
>--- template/en/default/bug/testplan_with_class.html.tmpl	31 Jul 2008 23:48:54 -0000	1.3
>+++ template/en/default/bug/testplan_with_class.html.tmpl	13 Aug 2008 07:12:30 -0000
>@@ -126,9 +126,9 @@
> 	              var a=new Array( 
> 		      [% FOREACH tr = f.result_list_32bits %]
> 		          [% IF loop.last %]
>-                              [ "[% tr.test_id %]","[% tr.result_id %]","[% tr.hardware_id %]" ] 
>+                              [ "[% tr.test_id %]","[% tr.result_id %]","[% tr.hardware_id %]","[% tr.info_result_id %]","[% tr.info_hardware_id %]" ] 
> 			  [% ELSE %]
>-                              [ "[% tr.test_id %]","[% tr.result_id %]","[% tr.hardware_id %]" ],
>+                              [ "[% tr.test_id %]","[% tr.result_id %]","[% tr.hardware_id %]","[% tr.info_result_id %]","[% tr.info_hardware_id %]" ],
> 			  [% END %]
>                       [% END %] );
>                       var i, j;
>@@ -153,11 +153,25 @@
> 				  }else{
> 			              hardwareHTML="&nbsp&nbsp<a>Hardware</a>";
> 				  }	
>+                                   
>+                                  if(a[i][3])
>+				  {
>+			              info_resultHTML="<a href=\"results.cgi?cert_id=[% bug.bug_id FILTER url_quote %]&id="+a[i][3]+"\">Results</a> ";
>+                                  } else {
>+			              info_resultHTML="<a>Results</a> ";
>+				  }
>+
>+				  if(a[i][4])
>+				  {
>+			              info_hardwareHTML="&nbsp&nbsp<a href=\"hardware.cgi?cert_id=[% bug.bug_id FILTER url_quote %]&id="+a[i][4]+"\">Hardware</a>";
>+				  }else{
>+			              info_hardwareHTML="&nbsp&nbsp<a>Hardware</a>";
>+				  }	
> 			      }
>                           }
>                       }
> 	          [% END %]
>-		  document.getElementById("links_for_select_32bits_[% f.id %]").innerHTML=resultHTML+hardwareHTML;
>+		  document.getElementById("links_for_select_32bits_[% f.id %]").innerHTML=resultHTML+hardwareHTML+"<br>"+info_resultHTML+info_hardwareHTML+"&nbsp(INFO)";
>                   document.getElementById("links_for_select_32bits_[% f.id %]").style.display="block";
> 	      }
>           }
>@@ -301,9 +315,9 @@
>                       var a=new Array( 
>                       [% FOREACH tr = f.result_list_64bits %]
>                           [% IF loop.last %]
>-                              [ "[% tr.test_id %]","[% tr.result_id %]","[% tr.hardware_id %]" ] 
>+                              [ "[% tr.test_id %]","[% tr.result_id %]","[% tr.hardware_id %]","[% tr.info_result_id %]","[% tr.info_hardware_id %]" ] 
>                           [% ELSE %]
>-                              [ "[% tr.test_id %]","[% tr.result_id %]","[% tr.hardware_id %]" ],
>+                              [ "[% tr.test_id %]","[% tr.result_id %]","[% tr.hardware_id %]","[% tr.info_result_id %]","[% tr.info_hardware_id %]" ],
>                           [% END %]
>                       [% END %] );
>                       var i, j;
>@@ -326,12 +340,26 @@
>                                       hardwareHTML="&nbsp&nbsp<a href=\"hardware.cgi?cert_id=[% bug.bug_id FILTER url_quote %]&id="+a[i][2]+"\">Hardware</a>";
>                                   }else{
>                                       hardwareHTML="&nbsp&nbsp<a>Hardware</a>";
>-                                  }   
>+                                  }
>+                              
>+                                  if(a[i][3])
>+                                  {
>+                                      info_resultHTML="<a href=\"results.cgi?cert_id=[% bug.bug_id FILTER url_quote %]&id="+a[i][3]+"\">Results</a> ";
>+                                  } else{
>+                                      info_resultHTML="<a>Results</a> ";
>+                                  }
>+
>+                                  if(a[i][4])
>+                                  {
>+                                      info_hardwareHTML="&nbsp&nbsp<a href=\"hardware.cgi?cert_id=[% bug.bug_id FILTER url_quote %]&id="+a[i][4]+"\">Hardware</a>";
>+                                  }else{
>+                                      info_hardwareHTML="&nbsp&nbsp<a>Hardware</a>";
>+                                  }
>                               }
>                           }
>                       }
>                   [% END %]
>-                  document.getElementById("links_for_select_64bits_[% f.id %]").innerHTML=resultHTML+hardwareHTML;
>+                  document.getElementById("links_for_select_64bits_[% f.id %]").innerHTML=resultHTML+hardwareHTML+"<br>"+info_resultHTML+info_hardwareHTML+"&nbsp(INFO)";
>                   document.getElementById("links_for_select_64bits_[% f.id %]").style.display="block";
>               }
>           }

Actions: View | Diff

Attachments on bug 457515: 314173 | 317028