X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/060d38d627bd1e51dd2b3c6e7de9af6aa7d7b6f3..1efba8f3b728a3b8aa3c64c5aa09f441318ff2a8:/services/api/test/unit/collection_performance_test.rb diff --git a/services/api/test/unit/collection_performance_test.rb b/services/api/test/unit/collection_performance_test.rb index 475202058e..bbae49f4a2 100644 --- a/services/api/test/unit/collection_performance_test.rb +++ b/services/api/test/unit/collection_performance_test.rb @@ -12,12 +12,11 @@ class CollectionModelPerformanceTest < ActiveSupport::TestCase setup do # The Collection model needs to have a current token, not just a # current user, to sign & verify manifests: - Thread.current[:api_client_authorization] = - api_client_authorizations(:active) + Thread.current[:token] = api_client_authorizations(:active).token end teardown do - Thread.current[:api_client_authorization] = nil + Thread.current[:token] = nil end # "crrud" == "create read render update delete", not a typo @@ -27,7 +26,7 @@ class CollectionModelPerformanceTest < ActiveSupport::TestCase files_per_stream: 100, blocks_per_file: 20, bytes_per_block: 2**26, - api_token: api_token(:active)) + api_token: api_client_authorizations(:active).token) end act_as_user users(:active) do c = time_block "new (manifest_text is #{bigmanifest.length>>20}MiB)" do @@ -43,14 +42,11 @@ class CollectionModelPerformanceTest < ActiveSupport::TestCase c = time_block 'read' do Collection.find_by_uuid(c.uuid) end - time_block 'sign' do - c.signed_manifest_text - end - time_block 'sign + render' do + time_block 'render' do c.as_api_response(nil) end loc = Blob.sign_locator(Digest::MD5.hexdigest('foo') + '+3', - api_token: api_token(:active)) + api_token: api_client_authorizations(:active).token) # Note Collection's strip_manifest_text method has now removed # the signatures from c.manifest_text, so we have to start from # bigmanifest again here instead of just appending with "+=".