17803: Fix unnecessarily convoluted test case.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --git a/lib/config/load_test.go b/lib/config/load_test.go
index 3e0368cc03835c7763c26534d237da882d5e8f3e..396faca48461b30d7d5708a55f05bafcf73159ac 100644 (file)
--- a/lib/config/load_test.go
+++ b/lib/config/load_test.go
@@ -209,18 +209,16 @@ Clusters:
       KeepStore:
         InternalURLs:
           "http://host.example:12345": {}
       KeepStore:
         InternalURLs:
           "http://host.example:12345": {}

-      # we use Keepproxy instead of Keepstore for the RendezVous test,
-      # to avoid the "keepstore has no volumes" warning
-      Keepproxy:
+      Keepstore:

         InternalURLs:
           "http://host.example:12345":
         InternalURLs:
           "http://host.example:12345":

-            # ideally we would reject Rendezvous here too, but
-            # currently we don't

             RendezVous: x
     ServiceS:
       Keepstore:
         InternalURLs:
           "http://host.example:12345": {}
             RendezVous: x
     ServiceS:
       Keepstore:
         InternalURLs:
           "http://host.example:12345": {}

+    Volumes:
+      zzzzz-nyw5e-aaaaaaaaaaaaaaa: {}

 `, &logbuf).Load()
        c.Assert(err, check.IsNil)
        c.Log(logbuf.String())
 `, &logbuf).Load()
        c.Assert(err, check.IsNil)
        c.Log(logbuf.String())