4523: Clear up manifest-signing vs. locator-signing.

[arvados.git] / services / api / test / test_helper.rb

diff --git a/services/api/test/test_helper.rb b/services/api/test/test_helper.rb
index 996d91606de78332f7e91a8d57b554bfc38a5a8d..216dd2d02d9ebaf3ab7b9fcd4345ad05bd374c9f 100644 (file)
--- 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