Make metadata script possible to test without Click test runner.

Author: Rebecka Gulliksson

src/satosa/scripts/satosa_saml_metadata.py

@@ -4,8 +4,8 @@
 from saml2.config import Config
 from saml2.sigver import security_context
 
-from satosa.metadata_creation.saml_metadata import create_signed_entities_descriptor
 from ..metadata_creation.saml_metadata import create_entity_descriptors
+from ..metadata_creation.saml_metadata import create_signed_entities_descriptor
 from ..satosa_config import SATOSAConfig
 
 
@@ -16,16 +16,7 @@ def _get_security_context(key, cert):
     return security_context(conf)
 
 
-@click.command()
-@click.argument("proxy_conf")
-@click.argument("key")
-@click.argument("cert")
-@click.option("--dir",
-              type=click.Path(exists=True, file_okay=False, dir_okay=True, writable=True, readable=False,
-                              resolve_path=False),
-              default=".", help="Where the output files should be written.")
-@click.option("--valid", type=click.INT, default=None, help="Number of hours the metadata should be valid.")
-def construct_saml_metadata(proxy_conf, key, cert, dir, valid):
+def create_and_write_saml_metadata(proxy_conf, key, cert, dir, valid):
     """
     Generates SAML metadata for the given PROXY_CONF, signed with the given KEY and associated CERT.
     """
@@ -42,3 +33,16 @@ def construct_saml_metadata(proxy_conf, key, cert, dir, valid):
         print("Writing metadata to '{}'".format(path))
         with open(path, "w") as f:
             f.write(metadata)
+
+
+@click.command()
+@click.argument("proxy_conf")
+@click.argument("key")
+@click.argument("cert")
+@click.option("--dir",
+              type=click.Path(exists=True, file_okay=False, dir_okay=True, writable=True, readable=False,
+                              resolve_path=False),
+              default=".", help="Where the output files should be written.")
+@click.option("--valid", type=click.INT, default=None, help="Number of hours the metadata should be valid.")
+def construct_saml_metadata(proxy_conf, key, cert, dir, valid):
+    create_and_write_saml_metadata(proxy_conf, key, cert, dir, valid)

tests/satosa/scripts/test_satosa_saml_metadata.py

@@ -1,13 +1,11 @@
 import glob
-import json
 import os
 
-from click.testing import CliRunner
 from saml2.config import Config
 from saml2.mdstore import MetaDataFile
 from saml2.sigver import security_context
 
-from satosa.scripts.satosa_saml_metadata import construct_saml_metadata
+from satosa.scripts.satosa_saml_metadata import create_and_write_saml_metadata
 
 
 class TestConstructSAMLMetadata:
@@ -16,12 +14,7 @@ def test_command(self, tmpdir, cert_and_key, satosa_config_dict, saml_frontend_c
         satosa_config_dict["FRONTEND_MODULES"] = [saml_frontend_config]
         satosa_config_dict["BACKEND_MODULES"] = [saml_backend_config]
 
-        config_path = os.path.join(str(tmpdir), "config.yaml")
-        with open(config_path, "w") as f:
-            f.write(json.dumps(satosa_config_dict))
-
-        runner = CliRunner()
-        runner.invoke(construct_saml_metadata, [config_path, cert_and_key[1], cert_and_key[0], '--dir', str(tmpdir)])
+        create_and_write_saml_metadata(satosa_config_dict, cert_and_key[1], cert_and_key[0], str(tmpdir), None)
 
         conf = Config()
         conf.cert_file = cert_and_key[0]