fix click entry point, explicitly raise filenotfounderror when the ya…

…ml doesnt exist in combine_model functions within combine_yamls classes, add test that would catch a problematic click entrypoint function.

fre/pp/frepp.py

@@ -2,7 +2,7 @@
 
 import click
 from .checkoutScript import checkoutTemplate
-from .configure_script_yaml import yamlInfo
+from .configure_script_yaml import _yamlInfo
 from .configure_script_xml import convert
 from .validate import validate_subtool
 from .install import install_subtool
@@ -100,7 +100,7 @@ def install(context, experiment, platform, target):
 def configure_yaml(context,yamlfile,experiment,platform,target):
     # pylint: disable=unused-argument
     """ - Execute fre pp configure """
-    context.forward(yamlInfo)
+    context.forward(_yamlInfo)
 
 @pp_cli.command()
 @click.option("-e", "--experiment", type=str,

fre/tests/test_fre_pp_cli.py

@@ -71,6 +71,18 @@ def test_cli_fre_pp_configure_yaml_opt_dne():
     result = runner.invoke(fre.fre, args=["pp", "configure-yaml", "optionDNE"])
     assert result.exit_code == 2
 
+def test_cli_fre_pp_configure_yaml_fail1():
+    ''' fre pp configure-yaml '''
+    result = runner.invoke(fre.fre, args = [ "pp", "configure-yaml",
+                                             "-e", "FOO",
+                                             "-p", "BAR",
+                                             "-t", "BAZ",
+                                             "-y", "BOO"              ] )
+    assert all( [ result.exit_code == 1,
+                  isinstance(result.exception, FileNotFoundError )
+               ] )
+
+
 #-- fre pp install
 def test_cli_fre_pp_install():
     ''' fre pp install '''

fre/yamltools/combine_yamls.py

@@ -143,10 +143,12 @@ def combine_model(self):
         f1.write(f'name: &name "{self.name}"\n')
         f1.write(f'platform: &platform "{self.platform}"\n')
         f1.write(f'target: &target "{self.target}"\n\n')
-        with open(self.yml,'r',encoding='UTF-8') as f2:
-            f1.write("### MODEL YAML SETTINGS ###\n")
-            shutil.copyfileobj(f2,f1)
-
+        try:
+            with open(self.yml,'r',encoding='UTF-8') as f2:
+                f1.write("### MODEL YAML SETTINGS ###\n")
+                shutil.copyfileobj(f2,f1)
+        except Exception as exc:
+            raise FileNotFoundError(f'{self.yml} not found') from exc
     print(f"   model yaml: {self.yml}")
 
   def combine_compile(self):
@@ -231,10 +233,12 @@ def combine_model(self):
         f1.write(f'name: &name "{self.name}"\n')
         f1.write(f'platform: &platform "{self.platform}"\n')
         f1.write(f'target: &target "{self.target}"\n\n')
-        with open(self.yml,'r',encoding='UTF-8') as f2:
-            f1.write("### MODEL YAML SETTINGS ###\n")
-            shutil.copyfileobj(f2,f1)
-
+        try:
+            with open(self.yml,'r',encoding='UTF-8') as f2:
+                f1.write("### MODEL YAML SETTINGS ###\n")
+                shutil.copyfileobj(f2,f1)
+        except Exception as exc:
+            raise FileNotFoundError(f'{self.yml} not found') from exc
     print(f"   model yaml: {self.yml}")
 
   def combine_experiment(self):