[ARVADOS] updated: 1.2.0-43-g8e7c30852

[Git user]

Summary of changes:
 services/api/test/unit/collection_performance_test.rb | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

       via  8e7c30852f1cf244ae3c58e93acea705739e8625 (commit)
      from  945dd1588b84a3d19248aff4b9bd32c2ca8766eb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 8e7c30852f1cf244ae3c58e93acea705739e8625
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Mon Sep 17 10:34:43 2018 -0400

    13994: Fix token handling in collection performance test.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/services/api/test/unit/collection_performance_test.rb b/services/api/test/unit/collection_performance_test.rb
index 475202058..4efc947dd 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
@@ -50,7 +49,7 @@ class CollectionModelPerformanceTest < ActiveSupport::TestCase
         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 "+=".

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


hooks/post-receive
--