projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
19880: Fix tests
[arvados.git]
/
apps
/
workbench
/
test
/
test_helper.rb
diff --git
a/apps/workbench/test/test_helper.rb
b/apps/workbench/test/test_helper.rb
index 28a7fa51375bfd15acd9fc8b178eac7541376842..2e8ead94cdb5e46f905f8872ec1d7b84ddec1f87 100644
(file)
--- a/
apps/workbench/test/test_helper.rb
+++ b/
apps/workbench/test/test_helper.rb
@@
-158,7
+158,7
@@
class ActiveSupport::TestCase
}
end
def json_response
}
end
def json_response
- Oj.load(@response.body)
+ Oj.
safe_
load(@response.body)
end
end
end
end
@@
-362,6
+362,7
@@
module Minitest
n += 1
raise if n > 2 || e.is_a?(Skip)
STDERR.puts "Test failed, retrying (##{n})"
n += 1
raise if n > 2 || e.is_a?(Skip)
STDERR.puts "Test failed, retrying (##{n})"
+ ActiveSupport::TestCase.reset_api_fixtures_now
retry
end
rescue *PASSTHROUGH_EXCEPTIONS
retry
end
rescue *PASSTHROUGH_EXCEPTIONS