Merge remote-tracking branch 'origin/SHIBUI-570' into SHIBUI-570

TIER · Sep 12, 2018 · 78781de · 78781de
2 parents 8ac52b8 + 0721845
commit 78781de
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 15 deletions.
diff --git a/...nd/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy b/...nd/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy
@@ -460,9 +460,6 @@ class TestObjectGenerator {
             it.metadataURL = 'https://idp.unicon.net/idp/shibboleth'
 
             it.reloadableMetadataResolverAttributes = new ReloadableMetadataResolverAttributes().with {
-                it.minRefreshDelay = 'PT5M'
-                it.maxRefreshDelay = 'PT1H'
-                it.refreshDelayFactor = 0.75
                 it
             }
             it

diff --git a/backend/src/test/resources/conf/278.2.xml b/backend/src/test/resources/conf/278.2.xml
@@ -39,10 +39,7 @@
     <MetadataProvider id="HTTPMetadata"
                       xsi:type="FileBackedHTTPMetadataProvider"
                       backingFile="unicon.xml"
-                      metadataURL="https://idp.unicon.net/idp/shibboleth"
-                      minRefreshDelay="PT5M"
-                      maxRefreshDelay="PT1H"
-                      refreshDelayFactor="0.75">
+                      metadataURL="https://idp.unicon.net/idp/shibboleth">
         <MetadataFilter xsi:type="SignatureValidation" requireSignedRoot="true"
                         certificateFile="%{idp.home}/credentials/inc-md-cert.pem" />
     </MetadataProvider>

diff --git a/backend/src/test/resources/conf/278.xml b/backend/src/test/resources/conf/278.xml
@@ -32,10 +32,7 @@
     <MetadataProvider id="HTTPMetadata"
                       xsi:type="FileBackedHTTPMetadataProvider"
                       backingFile="unicon.xml"
-                      metadataURL="https://idp.unicon.net/idp/shibboleth"
-                      minRefreshDelay="PT5M"
-                      maxRefreshDelay="PT1H"
-                      refreshDelayFactor="0.75">
+                      metadataURL="https://idp.unicon.net/idp/shibboleth">
         <MetadataFilter xsi:type="SignatureValidation" requireSignedRoot="true"
                         certificateFile="%{idp.home}/credentials/inc-md-cert.pem" />
     </MetadataProvider>

diff --git a/backend/src/test/resources/conf/532.xml b/backend/src/test/resources/conf/532.xml
@@ -8,8 +8,5 @@
     <MetadataProvider id="HTTPMetadata"
                       xsi:type="FileBackedHTTPMetadataProvider"
                       backingFile="unicon.xml"
-                      metadataURL="https://idp.unicon.net/idp/shibboleth"
-                      minRefreshDelay="PT5M"
-                      maxRefreshDelay="PT1H"
-                      refreshDelayFactor="0.75" />
+                      metadataURL="https://idp.unicon.net/idp/shibboleth" />
 </MetadataProvider>