testability-driver 1.5.1 → 1.5.2

data/lib/tdriver-devtools/doc/xslt/template.xsl

@@ -17,7 +17,7 @@
       {
          padding: 10px;
          border: #e7e7e7 1px solid;
-         background: #74C2E1;
+         background: #ffffff;
          color: black;
          font-size: 13px;
          cursor: default;
@@ -332,6 +332,15 @@
         text-align: center;
 		
       }
+      
+      a.toc_item2
+      {
+      
+        font-size: 11px;
+        text-decoration: none;
+        color: #313131;
+		
+      }
 
       a.toc_item:hover
       {
@@ -339,6 +348,13 @@
         border-bottom: 1px dotted #515151;
 
       }
+      
+      a.toc_item2:hover
+      {
+      
+        border-bottom: 1px dotted #515151;
+
+      }
 
       
       a.jump_to
@@ -422,7 +438,38 @@
     </xsl:template>
 
     <xsl:template match="documentation">
+<!-- table of contents -->
+  <br />
+  
+  
 
+    <xsl:for-each select="feature/@name">
+
+      <xsl:sort select="." />
+
+      <!---
+
+        file:///home/jussi/git/2010-10-07/driver/lib/output/example.xml#QT;TestObject;activate
+
+      -->
+
+      <xsl:variable name="name"><xsl:value-of select="../@name"/></xsl:variable>
+      <xsl:variable name="module"><xsl:value-of select="../behaviour/@module"/></xsl:variable>
+      <xsl:variable name="module_name"><xsl:value-of select="../behaviour/@name"/></xsl:variable>
+
+      <xsl:for-each select="str:split(.,';')">
+        <span class="toc_block"><a href="#{ $module_name }:{ $name }" class="toc_item2" title="{ $module_name } ({ $module })"><xsl:value-of select="." /></a><xsl:text> </xsl:text></span>
+      </xsl:for-each>
+
+      <xsl:text> </xsl:text>
+    
+    </xsl:for-each>
+    
+
+  <br />
+
+  <!-- content -->
+  
   <!-- table of contents -->
         <center>
             <span class="toc_title">Table of contents:</span>

data/lib/tdriver/base/sut/generic/behaviours/switchbox_behaviour.rb

@@ -88,11 +88,13 @@ module MobyBehaviour
         raise BehaviourError.new("reboot", "switchbox_sleep_after_powerup_in_reboot could not be converted to integer")
       end
       
-      power_down
       begin
         disconnect
       rescue
       end
+      
+      power_down
+
       sleep sleep_time_before_powerup
       power_up
       sleep sleep_time_after_powerup

data/lib/tdriver/report/report_creator.rb

@@ -52,12 +52,24 @@ module TDriverReportCreator
       $tdriver_reporter.set_total_run(0)
       $tdriver_reporter.update_summary_page('inprogress')
       $tdriver_reporter.update_environment_page()
-      at_exit {
+      at_exit {        
         while $run_status_thread_active == true
           sleep 1
         end
+        if $new_test_case!=nil
+          if $new_test_case.test_case_ended==false
+            end_test_case($new_test_case.test_case_name,'not_run')
+          end
+        end
         puts 'Generating report summary...'
-        $tdriver_reporter.update_summary_page('finished')
+        exit_status=''
+  
+        exit_status << "Stderr:#{$stderr}<hr/>"
+        exit_status << "Stdout:#{$stdout}<hr/>"
+        exit_status << "Exit command:#{$!}<br/>"
+        exit_status << "Backtrace:#{$@}"
+        
+        $tdriver_reporter.update_summary_page('finished',exit_status)
         puts 'Summary generated...'
         puts 'Generating total run table...'
         $tdriver_reporter.update_test_case_summary_pages('all')
@@ -89,7 +101,7 @@ module TDriverReportCreator
         puts 'Junit generated...'
         #$tdriver_reporter.delete_result_storage()
         $tdriver_reporter.disconnect_connected_devices()
-        #tdriver_log_page $tdriver_reporter.update_tdriver_log_page()
+        $tdriver_reporter.update_tdriver_log_page()
         puts 'Report generated to:'
         puts $tdriver_reporter.report_folder()
         clean_video_files
@@ -116,6 +128,9 @@ module TDriverReportCreator
   # === raises
   def error_in_connection_detected
     error_in_connection if $parameters[ :custom_error_recovery_module, nil ]!=nil
+    $tdriver_reporter.connection_errors+=1 if $tdriver_reporter
+    $new_test_case.connection_errors+=1 if $new_test_case
+    $new_test_case.set_test_case_execution_log('<b style="color: #FF0000">WARNING: Connection error detected!</b>') if $new_test_case
   end
   #This method returns the group where the test case belongs
   #
@@ -181,8 +196,9 @@ module TDriverReportCreator
       $new_test_case.test_case_total_dump_count,
       $new_test_case.test_case_total_data_sent,
       $new_test_case.test_case_total_data_received,
-      $new_test_case.test_case_user_data,
-      $new_test_case.test_case_user_data_columns
+      $new_test_case.test_case_user_data,      
+      $new_test_case.test_case_user_data_columns,
+      $new_test_case.connection_errors
     )
 
     $tdriver_reporter.test_case_user_xml_data=Hash.new
@@ -203,7 +219,7 @@ module TDriverReportCreator
             $tdriver_reporter.update_test_case_summary_pages('statistics')
             $tdriver_reporter.group_results_by_test_case()
             $new_junit_xml_results.create_junit_xml()
-            #tdriver_log_page $tdriver_reporter.update_tdriver_log_page()
+            $tdriver_reporter.update_tdriver_log_page()
             #ML: Update summary every 10 seconds improves performance during execution
             sleep 10
             $run_status_thread_active=false
@@ -346,7 +362,7 @@ module TDriverReportCreator
     if $new_test_case==nil
       @_stored_details << details
     else
-      if @_stored_details!=[]
+      if @_stored_details!=[] && @_stored_details!=nil
         @_stored_details.each do |detail|
           $new_test_case.set_test_case_execution_log(detail)
         end
@@ -401,19 +417,7 @@ module TDriverReportCreator
     begin
       create_test_case_folder($tdriver_reporter.fail_statuses.first)
       $new_test_case.capture_dump()
-      if $new_test_case.video_recording?
-        $new_test_case.copy_video_capture()
-      end
       error_in_test_case(TDriver::SUTFactory.connected_suts) if $parameters[ :custom_error_recovery_module, nil ]!=nil
-      begin
-
-          error_in_connection_detected
-
-      rescue Exception => e
-        update_test_case("Error recovery failed Exception: #{e.message} Backtrace: #{e.backtrace}")
-        end_test_case($new_test_case.test_case_name,'failed')
-        exit(1)
-      end
     rescue => ex
       puts ex.message
       puts ex.backtrace
@@ -453,7 +457,8 @@ module TDriverReportCreator
         if $new_test_case.test_case_logging_level.to_i > 0
           $tdriver_report_log_output.string.each do |line|
             $new_test_case.set_test_case_behaviour_log(line,nil)
-            #tdriver_log_page $tdriver_reporter.set_test_run_behaviour_log(line,full_tc_name)
+            $tdriver_reporter.set_test_run_behaviour_log(line,$new_test_case.test_case_name_full) if $new_test_case.report_short_folders=='false'
+            $tdriver_reporter.set_test_run_behaviour_log(line,"#{$new_test_case.test_case_status}_#{$new_test_case.test_case_index}") if $new_test_case.report_short_folders=='true'
           end
         end
       end
@@ -544,6 +549,9 @@ module TDriverReportCreator
         if found_crash_files.to_i > 0
           $new_test_case.capture_crash_files()
         end
+        if $new_test_case.video_recording?
+          $new_test_case.copy_video_capture()
+        end
       end
       if(status=='passed')
 

data/lib/tdriver/report/report_execution_statistics.rb

@@ -48,13 +48,14 @@ class ReportingStatistics
     end
     @total_statistics_arr << ["reboots",0]
     @total_statistics_arr << ["crashes",0]
+    @total_statistics_arr << ["connection_errors",0]
     @total_statistics_arr << ["duration",0]
     @total_statistics_arr << ["dump count",0]
     @total_statistics_arr << ["sent bytes",0]
     @total_statistics_arr << ["received bytes",0]
     @total_statistics_arr << ["used mem",0]
     @total_statistics_arr << ["pass rate",0]
-    @all_statuses << "reboots" << "crashes" << "duration" << "dump count" << "sent bytes" << "received bytes" << "used mem" << "pass rate"
+    @all_statuses << "reboots" << "crashes" << "connection_errors" << "duration" << "dump count" << "sent bytes" << "received bytes" << "used mem" << "pass rate"
   end
 
   def generate_statistics_headers()
@@ -70,6 +71,7 @@ class ReportingStatistics
     end
     status_heads << "<th abbr=\"link_column\"><b>Reboots</b></th>"
     status_heads << "<th abbr=\"link_column\"><b>Crashes</b></th>"
+    status_heads << "<th abbr=\"link_column\"><b>Connection Errors</b></th>"
     status_heads << "<th abbr=\"link_column\"><b>Duration</b></th>"
     status_heads << "<th abbr=\"link_column\"><b>Dump count</b></th>"
     status_heads << "<th abbr=\"link_column\"><b>Sent bytes</b></th>"
@@ -79,7 +81,7 @@ class ReportingStatistics
     status_heads
   end
 
-  def update_total_execution_statistics(tc_status,reboots,crashes,dump_count,sent_bytes,received_bytes,memory_usage)
+  def update_total_execution_statistics(tc_status,reboots,crashes,connection_errors,dump_count,sent_bytes,received_bytes,memory_usage)
     current_index=0
     @total_statistics_arr.each do |total_status|
       if tc_status==total_status[0]
@@ -91,6 +93,9 @@ class ReportingStatistics
       if total_status[0]=="crashes"
         @total_statistics_arr[current_index]=["crashes",total_status[1].to_i+crashes.to_i]
       end
+      if total_status[0]=="connection_errors"
+        @total_statistics_arr[current_index]=["connection_errors",total_status[1].to_i+connection_errors.to_i]
+      end
       if total_status[0]=="total"
         @total_statistics_arr[current_index]=["total",total_status[1].to_i+1]
       end
@@ -116,7 +121,7 @@ class ReportingStatistics
     end
   end
 
-  def update_test_case_execution_statistics(tc_name,tc_status,tc_execution,duration,tc_link,reboots,crashes,dump_count,sent_bytes,received_bytes,memory_usage)
+  def update_test_case_execution_statistics(tc_name,tc_status,tc_execution,duration,tc_link,reboots,crashes,connection_errors,dump_count,sent_bytes,received_bytes,memory_usage)
     b_test_in_statistics=false
     current_index=0
     total_run=0
@@ -138,6 +143,10 @@ class ReportingStatistics
         b_test_in_statistics=true
         @statistics_arr[current_index]=[tc_name,"crashes",total_status[2].to_i+crashes.to_i,tc_execution,tc_link]
       end
+      if total_status[1]=="connection_errors" && total_status[0]==tc_name
+        b_test_in_statistics=true
+        @statistics_arr[current_index]=[tc_name,"connection_errors",total_status[2].to_i+connection_errors.to_i,tc_execution,tc_link]
+      end
       if total_status[1]=="total" && total_status[0]==tc_name
         b_test_in_statistics=true
         @statistics_arr[current_index]=[tc_name,"total",total_status[2].to_i+1,tc_execution,tc_link]
@@ -202,16 +211,17 @@ class ReportingStatistics
       sent_bytes=test_case[14].to_i
       received_bytes=test_case[15].to_i
       memory_usage=test_case[6].to_i
+      connection_errors=test_case[16].to_i
 
       duration=test_case[5].to_f
       total_duration = total_duration + duration
       b_test_in_statistics=false
 
       #Update total statistics
-      update_total_execution_statistics(tc_status,reboots,crashes,dump_count,sent_bytes,received_bytes,memory_usage)
+      update_total_execution_statistics(tc_status,reboots,crashes,connection_errors,dump_count,sent_bytes,received_bytes,memory_usage)
 
       #Update current test case total statistics
-      b_test_in_statistics=update_test_case_execution_statistics(tc_name,tc_status,tc_execution,duration,tc_link,reboots,crashes,dump_count,sent_bytes,received_bytes,memory_usage)
+      b_test_in_statistics=update_test_case_execution_statistics(tc_name,tc_status,tc_execution,duration,tc_link,reboots,crashes,connection_errors,dump_count,sent_bytes,received_bytes,memory_usage)
 
       if b_test_in_statistics==false
         total_run=0
@@ -226,6 +236,8 @@ class ReportingStatistics
             @statistics_arr << [tc_name,"reboots",reboots.to_i,tc_execution,tc_link]
           elsif status=="crashes"
             @statistics_arr << [tc_name,"crashes",crashes.to_i,tc_execution,tc_link]
+          elsif status=="connection_errors"
+            @statistics_arr << [tc_name,"connection_errors",connection_errors.to_i,tc_execution,tc_link]
           elsif status=="total"
             total_run=1
             @statistics_arr << [tc_name,"total",1,tc_execution,tc_link]
@@ -274,6 +286,7 @@ class ReportingStatistics
       tc_link='<a href="cases/'+result_page.to_i.to_s+'_chronological_total_run_index.html">'
       tc_link='<a href="cases/1_reboot_index.html">' if status=="reboots" && total>0
       tc_link='<a href="cases/1_crash_index.html">' if status=="crashes" && total>0
+      tc_link='<a href="cases/1_connection_errors_index.html">' if status=="connection_errors" && total>0
       tc_link='<a href="cases/1_'+@pass_statuses.first.gsub(' ','_')+'_'+test_case.gsub(' ','_')+'_index.html">' if @pass_statuses.include?(status) && total>0
       tc_link='<a href="cases/1_'+@fail_statuses.first.gsub(' ','_')+'_'+test_case.gsub(' ','_')+'_index.html">' if @fail_statuses.include?(status) && total>0
       tc_link='<a href="cases/1_'+@not_run_statuses.first.gsub(' ','_')+'_'+test_case.gsub(' ','_')+'_index.html">' if @not_run_statuses.include?(status) && total>0
@@ -281,6 +294,7 @@ class ReportingStatistics
       tc_link='<a href="'+result_page.to_i.to_s+'_chronological_total_run_index.html">'
       tc_link='<a href="1_reboot_index.html">' if status=="reboots" && total>0
       tc_link='<a href="1_crash_index.html">' if status=="crashes" && total>0
+      tc_link='<a href="1_connection_errors_index.html">' if status=="connection_errors" && total>0
       tc_link='<a href="1_'+@pass_statuses.first.gsub(' ','_')+'_'+test_case.gsub(' ','_')+'_index.html">' if @pass_statuses.include?(status) && total>0
       tc_link='<a href="1_'+@fail_statuses.first.gsub(' ','_')+'_'+test_case.gsub(' ','_')+'_index.html">' if @fail_statuses.include?(status) && total>0
       tc_link='<a href="1_'+@not_run_statuses.first.gsub(' ','_')+'_'+test_case.gsub(' ','_')+'_index.html">' if @not_run_statuses.include?(status) && total>0

data/lib/tdriver/report/report_test_case_run.rb

@@ -67,7 +67,9 @@ module TDriverReportCreator
       :fail_statuses,
       :not_run_statuses,
       :test_case_logging_level,
-      :trace_directory
+      :trace_directory,
+      :connection_errors,
+      :report_short_folders
     )
     def initialize()
       @test_case_folder=nil
@@ -88,6 +90,7 @@ module TDriverReportCreator
       @failed_dump_error=nil
       @test_case_reboots=0
       @test_case_crash_files=0
+      @connection_errors=0
       @test_case_behaviour_log = Array.new
       @failed_screenshot=nil
       @test_case_group=nil
@@ -123,7 +126,8 @@ module TDriverReportCreator
             rescue
             end
             o = Log4r::IOOutputter.new("io",$tdriver_report_log_output)
-            MobyUtil::Logger.instance.add_outputter(logger_instance, o)
+            MobyUtil::Logger.instance.set_outputter_pattern(o, $parameters[ :logging_outputter_pattern, '%d [%c] [%l] %M' ])
+            MobyUtil::Logger.instance.add_outputter(logger_instance, o)            
           end
         end
       rescue

data/lib/tdriver/report/report_test_run.rb

@@ -59,8 +59,9 @@ module TDriverReportCreator
       :not_run_statuses,
       :report_editable,
       :test_fails,
-      :report_exclude_passed_cases
-
+      :report_exclude_passed_cases,
+      :connection_errors
+      
     )
     #class variables for summary report
     def initialize()
@@ -76,6 +77,7 @@ module TDriverReportCreator
       @total_not_run=0
       @total_crash_files=0
       @total_device_resets=0
+      @connection_errors=0
       @test_case_user_defined_status=nil
       @test_run_behaviour_log = Array.new
       @test_run_user_log = Array.new
@@ -512,8 +514,8 @@ module TDriverReportCreator
         write_page_end(@report_folder+'/cases/1_not_run_index.html')
         write_page_start(@report_folder+'/cases/1_total_run_index.html','Total run')
         write_page_end(@report_folder+'/cases/1_total_run_index.html')
-        #write_page_start(@report_folder+'/cases/tdriver_log_index.html','TDriver log')
-        #write_page_end(@report_folder+'/cases/tdriver_log_index.html')
+        write_page_start(@report_folder+'/cases/tdriver_log_index.html','TDriver log')
+        write_page_end(@report_folder+'/cases/tdriver_log_index.html')
         write_page_start(@report_folder+'/cases/statistics_index.html','Statistics')
         write_page_end(@report_folder+'/cases/statistics_index.html')
         if $parameters[ :report_generate_rdoc, 'false' ]=='true'
@@ -563,20 +565,25 @@ module TDriverReportCreator
     # === returns
     # nil
     # === raises
-    def update_summary_page(status)
+    def update_summary_page(status,exit_trace=nil)
       begin
         #Calculate run time
         @run_time=Time.now-@start_time
         if status=='inprogress'
           write_page_start(@report_folder+'/index.html','TDriver test results')
-          write_summary_body(@report_folder+'/index.html',@start_time,'Tests Ongoing...',@run_time,@total_run,@total_passed,@total_failed,@total_not_run,@total_crash_files,@total_device_resets)
+          write_summary_body(@report_folder+'/index.html',@start_time,'Tests Ongoing...',@run_time,@total_run,@total_passed,@total_failed,@total_not_run,@total_crash_files,@total_device_resets,@connection_errors)
           write_page_end(@report_folder+'/index.html')
         else
           all_cases_arr=read_result_storage('all')
           write_page_start(@report_folder+'/index.html','TDriver test results')
-          write_summary_body(@report_folder+'/index.html',@start_time,@end_time,@run_time,@total_run,@total_passed,@total_failed,@total_not_run,@total_crash_files,@total_device_resets,all_cases_arr)
+          write_summary_body(@report_folder+'/index.html',@start_time,@end_time,@run_time,@total_run,@total_passed,@total_failed,@total_not_run,@total_crash_files,@total_device_resets,@connection_errors,all_cases_arr)
           write_page_end(@report_folder+'/index.html')
         end
+        if exit_trace
+          write_page_start(@report_folder+'/exit.html','TDriver test results')
+          write_exit_body(@report_folder+'/exit.html',exit_trace,@report_folder)
+          write_page_end(@report_folder+'/exit.html')
+        end
       rescue Exception => e
         raise e, "Unable to update summary page", e.backtrace
       end
@@ -866,7 +873,8 @@ module TDriverReportCreator
         total_sent=0,
         total_received=0,
         user_data_rows=nil,
-        user_data_columns=nil)
+        user_data_columns=nil,
+        connection_errors=0)
       
       while $result_storage_in_use==true
         sleep 1
@@ -915,6 +923,8 @@ module TDriverReportCreator
           test_comment.content = comment
           test_link = Nokogiri::XML::Node.new("link",test)
           test_link.content = html_link
+          test_connection_errors = Nokogiri::XML::Node.new("connection_errors",test)
+          test_connection_errors.content = connection_errors
           test_dump_count = Nokogiri::XML::Node.new("dump_count",test)
           test_dump_count.content = calculate_total_values_from_hash(total_dump)
           test_sent_bytes = Nokogiri::XML::Node.new("sent_bytes",test)
@@ -934,6 +944,7 @@ module TDriverReportCreator
           test << test_log
           test << test_comment
           test << test_link
+          test << test_connection_errors
           test << test_dump_count
           test << test_sent_bytes
           test << test_received_bytes
@@ -1005,6 +1016,7 @@ module TDriverReportCreator
                 xml.log log
                 xml.comment comment
                 xml.link html_link
+                xml.connection_errors connection_errors
                 xml.dump_count calculate_total_values_from_hash(total_dump)
                 xml.sent_bytes calculate_total_values_from_hash(total_sent)
                 xml.received_bytes calculate_total_values_from_hash(total_received)
@@ -1144,7 +1156,9 @@ module TDriverReportCreator
             nodes=xml_data.root.xpath("//tests/test[crashes>0]")
           elsif results=='reboot'
             nodes=xml_data.root.xpath("//tests/test[reboots>0]")
-          elsif results!='all' && results!='crash' && results!='reboot'
+          elsif results=='connection_errors'
+            nodes=xml_data.root.xpath("//tests/test[connection_errors>0]")
+          elsif results!='all' && results!='crash' && results!='reboot' && results!='connection_errors'
             case results
             when 'passed'
 
@@ -1184,6 +1198,7 @@ module TDriverReportCreator
             dump_count=node.search("dump_count").text #12
             sent_bytes=node.search("sent_bytes").text #13
             received_bytes=node.search("received_bytes").text #14
+            connection_errors=node.search("connection_errors").text #15
             user_data = Hash.new
             node.xpath("user_display_data/data").each do |data_node|
               value_name =  data_node.get_attribute("id")
@@ -1206,7 +1221,8 @@ module TDriverReportCreator
               user_data,
               dump_count,
               sent_bytes,
-              received_bytes
+              received_bytes,
+              connection_errors
             ]
 
             result_storage << current_record
@@ -1354,7 +1370,7 @@ module TDriverReportCreator
           @all_cases_arr=read_result_storage('all')
           write_page_start(@report_folder+'/cases/statistics_index.html','Statistics')
           write_test_case_summary_body(@report_folder+'/cases/statistics_index.html','statistics',@all_cases_arr)
-          write_duration_graph(@report_folder+'/cases/statistics_index.html', @report_folder, 'duration_graph.png', @all_cases_arr) if @duration_graph!=false
+          write_duration_graph(@report_folder+'/cases/statistics_index.html', @report_folder, 'duration_graph.png', @all_cases_arr) if @duration_graph=='true'
           write_page_end(@report_folder+'/cases/statistics_index.html')
         when 'all'
           @all_cases_arr=read_result_storage(status)
@@ -1382,7 +1398,8 @@ module TDriverReportCreator
         @all_cases_arr=nil
         update_test_case_summary_pages_for_crashes_and_reboots(rewrite)
       rescue Exception => e
-        raise e, "Unable to update test case summary pages", caller
+        puts e.backtrace 
+        raise e, "Unable to update test case summary pages", caller        
       end
       return nil
     end
@@ -1392,6 +1409,7 @@ module TDriverReportCreator
       begin
         update_test_case_summary_page('crash',rewrite,'Crash')
         update_test_case_summary_page('reboot',rewrite,'Reboot')
+        update_test_case_summary_page('connection_errors',rewrite,'Connection Errors')
       rescue Exception => e
         raise e, "Unable to update test case summary pages for crashes and reboots", caller
       end

data/lib/tdriver/report/report_writer.rb

@@ -626,6 +626,7 @@ display: block;
         formatted_log=log_row[0].gsub('PASS;','')
         formatted_log=formatted_log.gsub('FAIL;','')
         formatted_log=formatted_log.gsub('BEHAVIOUR TDriver:','')
+        formatted_log=formatted_log.gsub('[TDriver] [BEHAVIOUR]','')
         formatted_log=formatted_log.gsub('WARNING;','')
         formatted_log=formatted_log.gsub('DEBUG TDriver:','')
         formatted_log=formatted_log.gsub('INFO TDriver:','')
@@ -672,7 +673,7 @@ display: block;
     case title
     when "TDriver test results"
       stylesheet='<link rel="stylesheet" title="TDriverReportStyle" href="tdriver_report_style.css"/>'
-    when "TDriver test environment","Total run","Statistics","Passed","Failed","Not run","Crash","Reboot","TDriver log"
+    when "TDriver test environment","Total run","Statistics","Passed","Failed","Not run","Crash","Reboot","Connection Errors", "TDriver log"
       stylesheet='<link rel="stylesheet" title="TDriverReportStyle" href="../tdriver_report_style.css"/>'
     else
       if title.include?("Test:")
@@ -1028,6 +1029,20 @@ display: block;
         html_body << '<form action="save_results_to" ><input type="submit" name="save_results_to" value="Download report" /></form>' if @report_editable=='true'
         tdriver_group=nil
         html_result=nil
+      when 'connection_errors'
+        title='<div class="page_title"><center><h1>Connection Errors</h1></center></div>'<<
+          '<div class="summary_reboot">' <<
+          '<form action="save_total_run_results" >'
+        tdriver_group=ReportingGroups.new(@reporting_groups,tc_arr,false)
+        tdriver_group.parse_groups()
+        html_result=tdriver_group.generate_report('all')
+        html_body << title
+        html_body << html_result
+        html_body << "<input type=\"submit\" name=\"save_changes\" value=\"Save changes\" />" if @report_editable=='true'
+        html_body << "</form>"
+        html_body << '<form action="save_results_to" ><input type="submit" name="save_results_to" value="Download report" /></form>' if @report_editable=='true'
+        tdriver_group=nil
+        html_result=nil
       when 'statistics'
         title='<div class="page_title"><center><h1>Statistics</h1></center></div>'<<
           '<div class="statistics">'
@@ -1085,7 +1100,7 @@ display: block;
 
   end
 
-  def write_summary_body(page,start_time,end_time,run_time,total_run,total_passed,total_failed,total_not_run,total_crash_files,total_device_resets,summary_arr=nil)
+  def write_summary_body(page,start_time,end_time,run_time,total_run,total_passed,total_failed,total_not_run,total_crash_files,total_device_resets,connection_errors,summary_arr=nil)
     fail_rate="0"
     pass_rate="0"
     if total_run.to_i > total_not_run.to_i
@@ -1107,7 +1122,7 @@ display: block;
       '<td>'+start_time.strftime("%d.%m.%Y %H:%M:%S")+'</td>'<<
       '</tr>'<<
       '<tr>'<<
-      '<td><b>Ended</b></td>'
+      '<td><a href="exit.html"><b>Ended</b></a></td>'
     begin
       html_body+='<td>'+end_time.strftime("%d.%m.%Y %H:%M:%S")+'</td>'
     rescue
@@ -1141,6 +1156,10 @@ display: block;
       '<tr>'<<
       '<td><b>Total device resets</b></td>'<<
       '<td>'+total_device_resets.to_s+'</td>'<<
+      '</tr>'<<
+      '<tr>'<<
+      '<td><b>Total connection errors</b></td>'<<
+      '<td>'+connection_errors.to_s+'</td>'<<
       '</tr>'
     if  $parameters[ :report_generate_rdoc, 'false' ]=='true'
       html_body << '<tr>'<<
@@ -1273,6 +1292,18 @@ display: block;
     end
     html_body=nil
   end
+  
+  def write_exit_body(page,exit_log,folder)
+
+    html_body='<div class="page_title"><center><h1>TDriver execution exit trace</h1></center></div>'<<
+      "<div class=\"environment\">#{format_execution_log(exit_log,folder.to_s)}</div>"
+    create_behaviour_links()
+    File.open(page, 'a') do |f2|
+      f2.puts html_body
+    end
+    html_body=nil
+  end
+  
   def write_tdriver_log_body(page,log)
     if log.length > 0
       log_summary=behaviour_log_summary(log,'array')
@@ -1347,7 +1378,7 @@ display: block;
       passed_link="#{report_page}_passed_index.html\" class=\"current\""
       failed_link="1_failed_index.html\""
       not_run_link="1_not_run_index.html\""
-    when "Failed","Crash","Reboot"
+    when "Failed","Crash","Reboot", "Connection Errors"
       tdriver_test_results_link='../index.html"'
       tdriver_test_environment_link='../environment/index.html"'
       tdriver_log_link='tdriver_log_index.html"'
@@ -1369,11 +1400,11 @@ display: block;
       tdriver_test_results_link='../index.html"'
       tdriver_test_environment_link='../environment/index.html"'
       tdriver_log_link='tdriver_log_index.html" class="current"'
-      total_run_link="#{report_page}_total_run_index.html\""
+      total_run_link="1_total_run_index.html\""
       statistics_link='statistics_index.html"'
-      passed_link="#{report_page}_passed_index.html\""
-      failed_link="#{report_page}_failed_index.html\""
-      not_run_link="#{report_page}_not_run_index.html\""
+      passed_link="1_passed_index.html\""
+      failed_link="1_failed_index.html\""
+      not_run_link="1_not_run_index.html\""
     else
       if title.include?("Test:")
         tdriver_test_results_link='../index.html"'
@@ -1407,6 +1438,9 @@ display: block;
       statistics_link<<
       '>Statistics</a></li>'<<
       '<li><a href="'<<
+      tdriver_log_link<<
+      '>Log</a></li>'<<
+      '<li><a href="'<<
       total_run_link<<
       '>Total run</a></li>'<<
       '<li><a href="'<<

data/lib/tdriver/util/logger/logger.rb

@@ -561,7 +561,9 @@ module MobyUtil
 
           log( *exit_status )
 
-        rescue
+        rescue Exception => ex
+          puts ex.message
+          puts ex.backtrace
 
         end
 

data/lib/tdriver/version.rb

@@ -18,4 +18,4 @@
 ############################################################################
 
 
-ENV['TDRIVER_VERSION'] = '1.5.1'
+ENV['TDRIVER_VERSION'] = '1.5.2'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: testability-driver
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 1
   - 5
-  - 1
-  version: 1.5.1
+  - 2
+  version: 1.5.2
 platform: ruby
 authors: 
 - Testability Driver team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin/
 cert_chain: []
 
-date: 2012-03-16 00:00:00 +02:00
+date: 2012-04-02 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency