set cwd in test so config file can be found

Author: cadenmyers13

docs/source/examples/labpdfprocapp-example.rst

@@ -87,7 +87,7 @@ To save the correction file, specify the ``-c`` or ``--output-correction`` flag,
 
     labpdfproc mud zro2_mo.xy 2.5 -w 0.71303 -c
 
-This will then save the correction file in the same directory as the input file with the name ``zro2_mo_cve.chi``.
+This will then save the correction file in the same directory as the input file with the name ``zro2_mo-cve.chi``.
 
 ``labpdfproc zscan`` Command
 ----------------------------
@@ -125,7 +125,7 @@ To save the correction file, specify the ``-c`` or ``--output-correction`` flag,
 
     labpdfproc zscan CeO2_635um_accum_0.xy CeO2_635um_zscan.xy -w 0.71303 -c
 
-This will then save the correction file in the same directory as the input file with the name ``CeO2_635um_accum_0_cve.chi``.
+This will then save the correction file in the same directory as the input file with the name ``CeO2_635um_accum_0-cve.chi``.
 
 ``labpdfproc sample`` Command
 -----------------------------
@@ -165,7 +165,7 @@ To save the correction file, specify the ``-c`` or ``--output-correction`` flag,
 
     labpdfproc sample zro2_mo.xy ZrO2 17.45 1.2 -w 0.71303 -c
 
-This will then save the correction file in the same directory as the input file with the name ``zro2_mo_cve.chi``.
+This will then save the correction file in the same directory as the input file with the name ``zro2_mo-cve.chi``.
 
 Additional CLI options
 ----------------------

news/check-saved-files.rst

@@ -6,6 +6,7 @@
 
 * Changed output file behavior to raise an error early if the saved file exists.
 * Changed saved file name from ``_corrected.chi`` to ``-mud-corrected.chi``.
+* Changed saved file name from ``_cve.chi`` to ``-cve.chi``.
 
 **Deprecated:**
 

src/diffpy/labpdfproc/labpdfprocapp.py

@@ -138,7 +138,7 @@ def _save_corrected(corrected, input_path, args):
 
 
 def _save_correction(correction, input_path, args):
-    corrfile = args.output_directory / (input_path.stem + "_cve.chi")
+    corrfile = args.output_directory / (input_path.stem + "-cve.chi")
     correction.metadata = correction.metadata or {}
     correction.dump(str(corrfile), xtype=args.xtype)
     print(f"Saved correction data to {corrfile}")

src/diffpy/labpdfproc/tools.py

@@ -537,7 +537,7 @@ def _check_saved_file_exists(args):
         if outfile.exists() and not args.force:
             existing_files.append(outfile)
         if args.output_correction:
-            corrfile = args.output_directory / (path.stem + "_cve.chi")
+            corrfile = args.output_directory / (path.stem + "-cve.chi")
             if corrfile.exists() and not args.force:
                 existing_files.append(corrfile)
     if existing_files:

tests/conftest.py

@@ -62,7 +62,7 @@ def user_filesystem(tmp_path):
 
     with open(output_dir / "good_data-mud-corrected.chi", "w") as f:
         f.write(chi_data)
-    with open(output_dir / "good_data_cve.chi", "w") as f:
+    with open(output_dir / "good_data-cve.chi", "w") as f:
         f.write(chi_data)
     home_config_data = {
         "wavelength": 0.3,

tests/test_tools.py

@@ -849,23 +849,29 @@ def test_load_metadata(mocker, user_filesystem, inputs, expected):
         assert actual_metadata == expected_metadata
 
 
-def test_preprocess_args_bad(user_filesystem):
+def test_preprocess_args_bad(user_filesystem, monkeypatch):
     # Case: user tries to run absorption correction, but the output
-    # filenames already for *-mud-corrected.chi and *_cve.chi exists.
+    # filenames already for *-mud-corrected.chi and *-cve.chi exists.
     # expected: preprocess_args catches this early and raises an Error
+    cwd = Path(user_filesystem)
+    home_dir = cwd / "home_dir"
+    # set cwd so program can find diffpyconfig.json
+    monkeypatch.setattr("pathlib.Path.home", lambda _: home_dir)
     input_data_file = str(user_filesystem / "good_data.chi")
     existing_corrected_file = str(
         user_filesystem / "output_dir" / "good_data-mud-corrected.chi"
     )
     existing_corrected_cve_file = str(
-        user_filesystem / "output_dir" / "good_data_cve.chi"
-    )
-    cli_inputs = (
-        ["mud"]
-        + [input_data_file]
-        + ["2.5", "-w", "Mo", "-o", str(user_filesystem / "output_dir")]
-        + ["-c"]  # -c flag saves the cve file
+        user_filesystem / "output_dir" / "good_data-cve.chi"
     )
+    cli_inputs = [
+        "mud",
+        input_data_file,
+        "2.5",
+        "-o",
+        str(user_filesystem / "output_dir"),
+        "-c",  # -c flag saves the cve file
+    ]
     args = get_args_cli(cli_inputs)
     args = set_input_lists(args)
     msg = (