From e02ef893c4f6cf881e449c248782b2ac21b49b0f Mon Sep 17 00:00:00 2001
From: Tom Clegg <tom@curoverse.com>
Date: Tue, 11 Nov 2014 12:44:02 -0500
Subject: [PATCH] 2853: Fix instance ID in test fixture hostnames. Clean up
 brittle tests.

---
 services/api/test/fixtures/keep_services.yml    |  6 +++---
 .../api/test/integration/keep_proxy_test.rb     | 17 ++++++++++-------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/services/api/test/fixtures/keep_services.yml b/services/api/test/fixtures/keep_services.yml
index 84ac316d0e..f668cbcd29 100644
--- a/services/api/test/fixtures/keep_services.yml
+++ b/services/api/test/fixtures/keep_services.yml
@@ -1,7 +1,7 @@
 keep0:
   uuid: zzzzz-bi6l4-6zhilxar6r8ey90
   owner_uuid: zzzzz-tpzed-d9tiejq69daie8f
-  service_host: keep0.qr1hi.arvadosapi.com
+  service_host: keep0.zzzzz.arvadosapi.com
   service_port: 25107
   service_ssl_flag: false
   service_type: disk
@@ -9,7 +9,7 @@ keep0:
 keep1:
   uuid: zzzzz-bi6l4-rsnj3c76ndxb7o0
   owner_uuid: zzzzz-tpzed-d9tiejq69daie8f
-  service_host: keep1.qr1hi.arvadosapi.com
+  service_host: keep1.zzzzz.arvadosapi.com
   service_port: 25107
   service_ssl_flag: false
   service_type: disk
@@ -17,7 +17,7 @@ keep1:
 proxy:
   uuid: zzzzz-bi6l4-h0a0xwut9qa6g3a
   owner_uuid: zzzzz-tpzed-d9tiejq69daie8f
-  service_host: keep.qr1hi.arvadosapi.com
+  service_host: keep.zzzzz.arvadosapi.com
   service_port: 25333
   service_ssl_flag: true
   service_type: proxy
diff --git a/services/api/test/integration/keep_proxy_test.rb b/services/api/test/integration/keep_proxy_test.rb
index d4155c2c4a..aacda517f2 100644
--- a/services/api/test/integration/keep_proxy_test.rb
+++ b/services/api/test/integration/keep_proxy_test.rb
@@ -6,20 +6,23 @@ class KeepProxyTest < ActionDispatch::IntegrationTest
     assert_response :success
     services = json_response['items']
 
-    assert_equal 2, services.length
-    assert_equal 'disk', services[0]['service_type']
-    assert_equal 'disk', services[1]['service_type']
+    assert_operator 2, :<=, services.length
+    services.each do |service|
+      assert_equal 'disk', service['service_type']
+    end
+  end
 
+  test "request keep proxy" do
     get "/arvados/v1/keep_services/accessible", {:format => :json}, auth(:active).merge({'HTTP_X_EXTERNAL_CLIENT' => '1'})
     assert_response :success
     services = json_response['items']
 
     assert_equal 1, services.length
 
-    assert_equal "zzzzz-bi6l4-h0a0xwut9qa6g3a", services[0]['uuid']
-    assert_equal "keep.qr1hi.arvadosapi.com", services[0]['service_host']
-    assert_equal 25333, services[0]['service_port']
-    assert_equal true, services[0]['service_ssl_flag']
+    assert_equal keep_services(:proxy).uuid, services[0]['uuid']
+    assert_equal keep_services(:proxy).service_host, services[0]['service_host']
+    assert_equal keep_services(:proxy).service_port, services[0]['service_port']
+    assert_equal keep_services(:proxy).service_ssl_flag, services[0]['service_ssl_flag']
     assert_equal 'proxy', services[0]['service_type']
   end
 end
-- 
2.30.2