added more tests for existing dir and existing file

Author: yucongalicechen

src/diffpy/labpdfproc/tests/test_tools.py

@@ -6,20 +6,34 @@
 from diffpy.labpdfproc.tools import set_output_directory
 
 params1 = [
-    ([None], [Path.cwd()]),
-    (["corrected"], [Path("corrected").resolve()]),
+    ([None], [Path.cwd().resolve()]),
+    (["."], [Path.cwd().resolve()]),
+    (["new_dir"], [Path.cwd().resolve() / "new_dir"]),
+    (["new_dir.py"], [Path.cwd().resolve() / "new_dir.py"]),
+    (["existing_dir"], [Path.cwd().resolve() / "existing_dir"]),
 ]
 
 
 @pytest.mark.parametrize("inputs, expected", params1)
 def test_set_output_directory(inputs, expected):
+    existing_dir = Path().cwd().resolve() / "existing_dir"
+    existing_dir.mkdir(parents=True, exist_ok=True)
+
     expected_output_directory = expected[0]
     actual_args = argparse.Namespace(output_directory=inputs[0])
     actual_args.output_directory = set_output_directory(actual_args)
     assert actual_args.output_directory == expected_output_directory
     assert Path(actual_args.output_directory).exists()
     assert Path(actual_args.output_directory).is_dir()
 
+
+def test_set_output_directory_bad():
+    existing_dir = Path().cwd().resolve() / "existing_dir.py"
+    with open(existing_dir, "w"):
+        pass
+
+    actual_args = argparse.Namespace(output_directory="existing_dir.py")
     with pytest.raises(FileExistsError):
-        actual_args = argparse.Namespace(output_directory="test_tools.py")
         actual_args.output_directory = set_output_directory(actual_args)
+        assert Path(actual_args.output_directory).exists()
+        assert not Path(actual_args.output_directory).is_dir()

src/diffpy/labpdfproc/tools.py

@@ -8,7 +8,7 @@ def set_output_directory(args):
     Parameters
     ----------
     args argparse.Namespace
-        input arguments provided by the user
+        the arguments from the parser
 
     Returns
     -------
@@ -18,9 +18,8 @@ def set_output_directory(args):
     If user provides an output directory, use it.
     Otherwise, we set it to the current directory if nothing is provided.
     We then create the directory if it does not exist.
-    If the provided directory is an existed file then we raise the FileExistsError.
 
     """
-    output_dir = Path(args.output_directory).resolve() if args.output_directory else Path.cwd()
+    output_dir = Path(args.output_directory).resolve() if args.output_directory else Path.cwd().resolve()
     output_dir.mkdir(parents=True, exist_ok=True)
     return output_dir