tweak the ivoa_bearer test to use production CADC reg

opencadc · Aug 29, 2024 · 4c9ff4e · 4c9ff4e
1 parent 3ef5406
commit 4c9ff4e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/cadc-rest/src/test/java/ca/nrc/cadc/rest/RestServletTest.java b/cadc-rest/src/test/java/ca/nrc/cadc/rest/RestServletTest.java
@@ -235,7 +235,7 @@ public void testSetChallenges() {
             }
             // expectation based on cadc-registry.properties and TestRegistryClient capability output below
             Assert.assertEquals("bearer", 1, foundBearer);
-            Assert.assertEquals("ivoa_bearer", 1, foundIvoaBearer);
+            Assert.assertEquals("ivoa_bearer", 1, foundIvoaBearer); // unable to configure for this hack
             Assert.assertEquals("ivoa_x509", 1, foundIvoaX509);
         } catch (Exception unexpected) {
             log.error("unexpected exception", unexpected);

diff --git a/cadc-rest/src/test/resources/cadc-registry.properties b/cadc-rest/src/test/resources/cadc-registry.properties
@@ -1,5 +1,6 @@
-# not used by tests
-ca.nrc.cadc.reg.client.RegistryClient.baseURL=https://example.net/reg
+# use CADC registry to lookup the #tls-with-password URL
+ca.nrc.cadc.reg.client.RegistryClient.baseURL=https://ws.cadc-ccda.hia-iha.nrc-cnrc.gc.ca/reg
+
+## needed for ivoa_bearer challenge, but then reg lookup needs to work
+ivo://ivoa.net/sso#tls-with-password = ivo://cadc.nrc.ca/gms
 
-## needed to inject ivoa_bearer challenge
-ivo://ivoa.net/sso#tls-with-password = ivo://cadc.nrc.ca/gms