soda 1.1.18 → 1.1.19

data/lib/Soda.rb

@@ -111,6 +111,7 @@ class Soda
       @SugarWait = false
       @restart_test_running = false
       @FAILEDTESTS = []
+      @GotWatchDog = false
       @vars = Hash.new
       blocked_file_list = "tests/modules/blockScriptList.xml"
       whitelist_file = "tests/modules/whitelist.xml"
@@ -828,11 +829,14 @@ class Soda
 
       if (@non_lib_test_count >= @restart_count)
          @rep.log("Restarting browser.\n")
-        
-         begin 
-            @browser.close()
-            sleep(1)
-         rescue Exception => e
+       
+         if (!@GotWatchDog) 
+            begin 
+               @browser.close()
+               sleep(1)
+            rescue Exception => e
+            end
+            @GotWatchDog = false
          end
 
          RestartGlobalTime()
@@ -2765,6 +2769,7 @@ JSCode
                   @rep.ReportFailure(msg)
                   PrintDebug("Global Time was: #{$global_time}\n")
                   PrintDebug("Timeout Time was: #{time_check}\n")
+                  @GotWatchDog = true
                   @rep.IncTestWatchDogCount()
                   begin
                      result_dir = @rep.GetResultDir()
@@ -2908,13 +2913,15 @@ JSCode
       end   
 
       tests.each do |test|
-#         next if (remBlockScript(test))
          test_order += 1
          tmp_result = {}
+         test_basename = File.basename(test, ".xml")
          tmp_result['result'] = run(test, false, true, suite_name)
          tmp_result['Test_Order'] = test_order
          tmp_result.merge!(@rep.GetRawResults)
-         
+         tmp_result['Real_Test_Name'] = test
+         logfile = tmp_result['Test Log File']
+
          if (tmp_result['Test Failure Count'].to_i != 0)
             tmp_result['result'] = -1
          elsif (tmp_result['Test JavaScript Error Count'].to_i != 0)
@@ -2925,19 +2932,7 @@ JSCode
             tmp_result['result'] = -1
          end
 
-         tmp_result['Real_Test_Name'] = test
-         test_basename = File.basename(test, ".xml")
-         logfile = tmp_result['Test Log File']
-         if (logfile =~ /#{test_basename}-\d+/)
-            test =~ /(.*\/)#{test_basename}/
-            ran_test_name = $1
-            ran_test_name << File.basename(logfile, ".log")
-            ran_test_name << ".xml"
-         else
-            ran_test_name = test
-         end
-
-         result[ran_test_name] = tmp_result
+         result[test] = tmp_result
          @rep.ZeroTestResults()
       end
 

data/lib/sodainfo.rb

@@ -1,4 +1,4 @@
 require 'Soda'
 
-SODA_GEM_VERSION = "1.1.18"
+SODA_GEM_VERSION = "1.1.19"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: soda
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: 
   segments: 
   - 1
   - 1
-  - 18
-  version: 1.1.18
+  - 19
+  version: 1.1.19
 platform: ruby
 authors: 
 - Trampus Richmond
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-07 00:00:00 -08:00
+date: 2011-03-08 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency