[ARVADOS] updated: 361a54cfb45565e9d85271eda4eff131231c33e4

[git at public.curoverse.com]

Summary of changes:
 services/api/app/controllers/arvados/v1/keep_disks_controller.rb | 2 +-
 services/api/test/integration/keep_proxy_test.rb                 | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

       via  361a54cfb45565e9d85271eda4eff131231c33e4 (commit)
      from  49066b9e703b26671ad4635aa8c1dbb3776ac591 (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 361a54cfb45565e9d85271eda4eff131231c33e4
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu May 15 09:06:05 2014 -0400

    2776: Generates a slightly more meaningful uuid for proxy.  Updated test.

diff --git a/services/api/app/controllers/arvados/v1/keep_disks_controller.rb b/services/api/app/controllers/arvados/v1/keep_disks_controller.rb
index dd3ca3a..fb5524c 100644
--- a/services/api/app/controllers/arvados/v1/keep_disks_controller.rb
+++ b/services/api/app/controllers/arvados/v1/keep_disks_controller.rb
@@ -34,7 +34,7 @@ class Arvados::V1::KeepDisksController < ApplicationController
       require 'uri'
       u = URI.parse(Rails.application.config.keep_proxy)
       kd = KeepDisk.new
-      kd.uuid = "00000-penuu-000000000000000"
+      kd.uuid = "#{Server::Application.config.uuid_prefix}-#{KeepDisk::uuid_prefix}-keepproxy000000"
       kd.service_host = u.hostname
       kd.service_port = u.port
       kd.service_ssl_flag = (u.scheme == 'https')
diff --git a/services/api/test/integration/keep_proxy_test.rb b/services/api/test/integration/keep_proxy_test.rb
index dc70f0f..c321462 100644
--- a/services/api/test/integration/keep_proxy_test.rb
+++ b/services/api/test/integration/keep_proxy_test.rb
@@ -7,16 +7,14 @@ class KeepProxyTest < ActionDispatch::IntegrationTest
     disks = json_response['items']
 
     assert_equal 3, disks.length
-    puts "\n", at response.body
 
     get "/arvados/v1/keep_disks", {:format => :json}, auth(:active).merge({'HTTP_X_NEED_KEEP_PROXY' => true})
     assert_response :success
     disks = json_response['items']
 
     assert_equal 1, disks.length
-    puts "\n", @response.body
 
-    assert_equal disks[0]['uuid'], "00000-penuu-000000000000000"
+    assert_equal disks[0]['uuid'], "zzzzz-penuu-keepproxy000000"
     assert_equal disks[0]['service_host'], "localhost"
     assert_equal disks[0]['service_port'], 25333
     assert_equal disks[0]['service_ssl_flag'], false

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


hooks/post-receive
--