Merge pull request #68 from epics-containers/fix-tests

fix merge resolution error

Author: gilesknap

src/epics_containers_cli/utils.py

@@ -82,7 +82,9 @@ def drop_ioc_path(raw_input: str):
     typer.echo(f"Extracted ioc name {extracted_ioc} from input: {raw_input}")
 
     return extracted_ioc
-  
+
+
+@contextlib.contextmanager
 def chdir(path):
     """
     A simple wrapper around chdir(), it changes the current working directory

tests/test_ioc.py

@@ -32,7 +32,7 @@ def test_deploy(mock_run, data: Path, ioc):
     shutil.copytree(data / "iocs", TMPDIR / "iocs")
     mock_run.run_cli("ioc deploy bl45p-ea-ioc-01 2.0")
 
-    
+
 def test_deploy_path(mock_run, data: Path, ioc):
     mock_run.set_seq(ioc.checks + ioc.deploy)
     # prep what deploy expects to find after it cloned bl45p repo