tests fixed

Author: Xiao Zhu

src/saml2/config.py

@@ -383,11 +383,13 @@ def load_metadata(self, metadata_conf):
             disable_validation = False
 
         mds = MetadataStore(
-            acs, self, ca_certs, disable_ssl_certificate_validation=disable_validation
+            acs,
+            self,
+            ca_certs,
+            disable_ssl_certificate_validation=disable_validation,
+            timeout=self.timeout,
         )
-
         mds.imp(metadata_conf)
-
         return mds
 
     def endpoint(self, service, binding=None, context=None):

src/saml2/ecp_client.py

@@ -78,7 +78,7 @@ def __init__(self, user, passwd, sp="", idp=None, metadata_file=None,
         self._verbose = verbose
 
         if metadata_file:
-            self._metadata = MetadataStore([saml, samlp], None, config)
+            self._metadata = MetadataStore([saml, samlp], None, config, timeout=config.timeout)
             self._metadata.load("local", metadata_file)
             logger.debug("Loaded metadata from '%s'", metadata_file)
         else:

src/saml2/mdstore.py

@@ -1022,7 +1022,7 @@ class MetadataStore(MetaData):
     def __init__(self, attrc, config, ca_certs=None,
                  check_validity=True,
                  disable_ssl_certificate_validation=False,
-                 filter=None):
+                 filter=None, timeout=None):
         """
         :params attrc:
         :params config: Config()
@@ -1032,9 +1032,9 @@ def __init__(self, attrc, config, ca_certs=None,
         MetaData.__init__(self, attrc, check_validity=check_validity)
 
         if disable_ssl_certificate_validation:
-            self.http = HTTPBase(verify=False, ca_bundle=ca_certs, timeout=config.timeout)
+            self.http = HTTPBase(verify=False, ca_bundle=ca_certs, timeout=timeout)
         else:
-            self.http = HTTPBase(verify=True, ca_bundle=ca_certs, timeout=config.timeout)
+            self.http = HTTPBase(verify=True, ca_bundle=ca_certs, timeout=timeout)
 
         self.security = security_context(config)
         self.ii = 0