Merge branch 'develop' into fix-compare-err-substring

Author: mitchute

src/ExpandObjects/tests/conftest.py

@@ -86,8 +86,9 @@ def who_called_me():
 
 
 class ExpandObjectsResult:
-    def __init__(self, run_dir: Path):
+    def __init__(self, run_dir: Path, returncode: int):
         self.run_dir = run_dir
+        self.returncode = returncode
 
         self.idf_text: str = (run_dir / "expanded.idf").read_text()
 
@@ -137,8 +138,8 @@ def _run(
         target_ep_idd_path = run_dir / ep_idd.name
         shutil.copy(ep_idd, run_dir / target_ep_idd_path)
 
-        subprocess.check_call([str(expandobjectsclipath), idf_file_path], cwd=run_dir)
+        completed_process = subprocess.run([str(expandobjectsclipath), idf_file_path], cwd=run_dir, check=False)
 
-        return ExpandObjectsResult(run_dir=run_dir)
+        return ExpandObjectsResult(run_dir=run_dir, returncode=completed_process.returncode)
 
     return _run

src/ExpandObjects/tests/test_ideal_loads_humidistat.py

@@ -92,6 +92,7 @@ def test_ideal_loads_without_exising_humidistat(prepare_and_run_expandobjects):
     """
 
     result: ExpandObjectsResult = prepare_and_run_expandobjects(ori_idf_text=ori_idf_text)
+    assert result.returncode == 0
     assert result.err_text is None, f"ExpandObjects failed with error: {result.err_text}"
     assert (
         "! HVACTemplate:Zone:IdealLoadsAirSystem," in result.idf_text
@@ -228,6 +229,7 @@ def test_ideal_loads_with_exising_humidistat(prepare_and_run_expandobjects):
   60.0;                                   !- Hourly Value
 """
     result: ExpandObjectsResult = prepare_and_run_expandobjects(ori_idf_text=ori_idf_text)
+    assert result.returncode == 0
     assert result.err_text is not None
     assert (
         'ExpandObjects: Warning: In HVACTemplate:Zone:IdealLoadsAirSystem "Zone 1" a ZoneControl:Humidistat named '
@@ -356,6 +358,7 @@ def test_ideal_loads_with_exising_humidistat_but_no_dehum_schedule(prepare_and_r
   30.0;                                   !- Hourly Value
 """
     result: ExpandObjectsResult = prepare_and_run_expandobjects(ori_idf_text=ori_idf_text)
+    assert result.returncode == 1
     assert result.err_text is not None
     assert (
         'ExpandObjects: Warning: In HVACTemplate:Zone:IdealLoadsAirSystem "Zone 1" a ZoneControl:Humidistat named '
@@ -438,6 +441,7 @@ def test_ideal_loads_with_exising_humidistat_but_no_hum_schedule(prepare_and_run
   60.0;                                   !- Hourly Value
 """
     result: ExpandObjectsResult = prepare_and_run_expandobjects(ori_idf_text=ori_idf_text)
+    assert result.returncode == 1
     assert result.err_text is not None
     assert (
         'ExpandObjects: Warning: In HVACTemplate:Zone:IdealLoadsAirSystem "Zone 1" a ZoneControl:Humidistat named '