X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/5fd423a57ab1f34162f4cb2c08bd6b0b2515af40..f5588e5c01baf3084ad42d8be506c4698b1affce:/services/api/test/test_helper.rb diff --git a/services/api/test/test_helper.rb b/services/api/test/test_helper.rb index 996d91606d..216dd2d02d 100644 --- a/services/api/test/test_helper.rb +++ b/services/api/test/test_helper.rb @@ -49,6 +49,10 @@ class ActiveSupport::TestCase Thread.current[:api_client_uuid] = nil Thread.current[:api_client] = nil Thread.current[:user] = nil + restore_configuration + end + + def restore_configuration # Restore configuration settings changed during tests $application_config.each do |k,v| if k.match /^[^.]*$/ @@ -88,13 +92,7 @@ class ActionController::TestCase def check_counter action @counter += 1 if @counter == 2 - # TODO: when existing mistakes are fixed, start failing broken - # test cases like this: - # - # assert_equal 1, 2, "Multiple actions in functional test" - # - # Meanwhile, just warn (just once per test case): - $stderr.puts " [WARNING: Multiple actions in functional test]" + assert_equal 1, 2, "Multiple actions in functional test" end end