[ARVADOS] created: 1.3.0-1604-g36b3f5c4d

[Git user]

        at  36b3f5c4d415897125a82fc733385ca999436c4e (commit)


commit 36b3f5c4d415897125a82fc733385ca999436c4e
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Wed Sep 11 16:42:58 2019 -0400

    15615: Retry failed wb1 tests twice before giving up.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/apps/workbench/test/test_helper.rb b/apps/workbench/test/test_helper.rb
index 1d26deefa..69cf43b1a 100644
--- a/apps/workbench/test/test_helper.rb
+++ b/apps/workbench/test/test_helper.rb
@@ -348,3 +348,29 @@ end
 
 # Reset fixtures now (i.e., before any tests run).
 ActiveSupport::TestCase.reset_api_fixtures_now
+
+module Minitest
+  class Test
+    def capture_exceptions *args
+      begin
+        n = 0
+        begin
+          yield
+        rescue *PASSTHROUGH_EXCEPTIONS
+          raise
+        rescue Exception => e
+          n += 1
+          raise if n > 2
+          STDERR.puts "Test failed, retrying (##{n})"
+          retry
+        end
+      rescue *PASSTHROUGH_EXCEPTIONS
+        raise
+      rescue Assertion => e
+        self.failures << e
+      rescue Exception => e
+        self.failures << UnexpectedError.new(e)
+      end
+    end
+  end
+end

commit 76ecdae1b68c29cac9a905e8c4ea00cfe569c3b7
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Wed Sep 11 16:42:42 2019 -0400

    15615: Don't save screenshots of skipped tests.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/apps/workbench/test/integration_helper.rb b/apps/workbench/test/integration_helper.rb
index 0c66e59c8..7209f2b6c 100644
--- a/apps/workbench/test/integration_helper.rb
+++ b/apps/workbench/test/integration_helper.rb
@@ -206,7 +206,7 @@ class ActionDispatch::IntegrationTest
   end
 
   teardown do
-    if not passed?
+    if !passed? && !skipped?
       screenshot
     end
     if Capybara.current_driver == :selenium

-----------------------------------------------------------------------


hooks/post-receive
--