Skip to content

Commit

Permalink
Add ignore patterns for audit diffs, add unit test
Browse files Browse the repository at this point in the history
  • Loading branch information
@Myoldmopar
Myoldmopar committed Nov 13, 2020
1 parent f32686e commit d04aae5
Show file tree
Hide file tree
Showing 4 changed files with 63 additions and 3 deletions.
2 changes: 2 additions & 0 deletions epregressions/runtests.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,8 @@ def diff_text_files(file_a, file_b, diff_file):
"(idf)=",
"(user input)=",
"(input file)=",
"(IDF Directory)=",
"(Current Working Directory)\"=",
"ReadVars Run Time",
"EnergyPlus Program Version",
"PythonPlugin: Class"
Expand Down
26 changes: 26 additions & 0 deletions epregressions/tests/resources/eplusout_base.audit
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
Processing Schedule Input -- Start
not found (Current Working Directory)"=/Users/commbldg/ci/clone_baseline/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
found (IDF Directory)=/Users/commbldg/ci/clone_baseline/testfiles/HybridModel_Measurements_with_HVAC.csv
not found (Current Working Directory)"=/Users/commbldg/ci/clone_baseline/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
found (IDF Directory)=/Users/commbldg/ci/clone_baseline/testfiles/HybridModel_Measurements_with_HVAC.csv
not found (Current Working Directory)"=/Users/commbldg/ci/clone_baseline/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
found (IDF Directory)=/Users/commbldg/ci/clone_baseline/testfiles/HybridModel_Measurements_with_HVAC.csv
not found (Current Working Directory)"=/Users/commbldg/ci/clone_baseline/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
found (IDF Directory)=/Users/commbldg/ci/clone_baseline/testfiles/HybridModel_Measurements_with_HVAC.csv
not found (Current Working Directory)"=/Users/commbldg/ci/clone_baseline/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
found (IDF Directory)=/Users/commbldg/ci/clone_baseline/testfiles/HybridModel_Measurements_with_HVAC.csv
not found (Current Working Directory)"=/Users/commbldg/ci/clone_baseline/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
found (IDF Directory)=/Users/commbldg/ci/clone_baseline/testfiles/HybridModel_Measurements_with_HVAC.csv
not found (Current Working Directory)"=/Users/commbldg/ci/clone_baseline/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
found (IDF Directory)=/Users/commbldg/ci/clone_baseline/testfiles/HybridModel_Measurements_with_HVAC.csv
not found (Current Working Directory)"=/Users/commbldg/ci/clone_baseline/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
found (IDF Directory)=/Users/commbldg/ci/clone_baseline/testfiles/HybridModel_Measurements_with_HVAC.csv
not found (Current Working Directory)"=/Users/commbldg/ci/clone_baseline/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
found (IDF Directory)=/Users/commbldg/ci/clone_baseline/testfiles/HybridModel_Measurements_with_HVAC.csv
not found (Current Working Directory)"=/Users/commbldg/ci/clone_baseline/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
found (IDF Directory)=/Users/commbldg/ci/clone_baseline/testfiles/HybridModel_Measurements_with_HVAC.csv
not found (Current Working Directory)"=/Users/commbldg/ci/clone_baseline/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
found (IDF Directory)=/Users/commbldg/ci/clone_baseline/testfiles/HybridModel_Measurements_with_HVAC.csv
Processing Schedule Input -- Complete
MonthlyInputCount= 63
sizeMonthlyInput= 75
26 changes: 26 additions & 0 deletions epregressions/tests/resources/eplusout_mod.audit
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
Processing Schedule Input -- Start
not found (Current Working Directory)"=/Users/commbldg/ci/clone_branch/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
found (IDF Directory)=/Users/commbldg/ci/clone_branch/testfiles/HybridModel_Measurements_with_HVAC.csv
not found (Current Working Directory)"=/Users/commbldg/ci/clone_branch/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
found (IDF Directory)=/Users/commbldg/ci/clone_branch/testfiles/HybridModel_Measurements_with_HVAC.csv
not found (Current Working Directory)"=/Users/commbldg/ci/clone_branch/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
found (IDF Directory)=/Users/commbldg/ci/clone_branch/testfiles/HybridModel_Measurements_with_HVAC.csv
not found (Current Working Directory)"=/Users/commbldg/ci/clone_branch/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
found (IDF Directory)=/Users/commbldg/ci/clone_branch/testfiles/HybridModel_Measurements_with_HVAC.csv
not found (Current Working Directory)"=/Users/commbldg/ci/clone_branch/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
found (IDF Directory)=/Users/commbldg/ci/clone_branch/testfiles/HybridModel_Measurements_with_HVAC.csv
not found (Current Working Directory)"=/Users/commbldg/ci/clone_branch/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
found (IDF Directory)=/Users/commbldg/ci/clone_branch/testfiles/HybridModel_Measurements_with_HVAC.csv
not found (Current Working Directory)"=/Users/commbldg/ci/clone_branch/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
found (IDF Directory)=/Users/commbldg/ci/clone_branch/testfiles/HybridModel_Measurements_with_HVAC.csv
not found (Current Working Directory)"=/Users/commbldg/ci/clone_branch/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
found (IDF Directory)=/Users/commbldg/ci/clone_branch/testfiles/HybridModel_Measurements_with_HVAC.csv
not found (Current Working Directory)"=/Users/commbldg/ci/clone_branch/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
found (IDF Directory)=/Users/commbldg/ci/clone_branch/testfiles/HybridModel_Measurements_with_HVAC.csv
not found (Current Working Directory)"=/Users/commbldg/ci/clone_branch/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
found (IDF Directory)=/Users/commbldg/ci/clone_branch/testfiles/HybridModel_Measurements_with_HVAC.csv
not found (Current Working Directory)"=/Users/commbldg/ci/clone_branch/build/testfiles/HybridModel_4Zone_Solve_PeopleCount_with_HVAC/HybridModel_Measurements_with_HVAC.csv
found (IDF Directory)=/Users/commbldg/ci/clone_branch/testfiles/HybridModel_Measurements_with_HVAC.csv
Processing Schedule Input -- Complete
MonthlyInputCount= 63
sizeMonthlyInput= 75
12 changes: 9 additions & 3 deletions epregressions/tests/test_runtests.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1970,10 +1970,16 @@ def test_eio_diff_with_utf8(self):
self.assertEqual(TextDifferences.DIFFS, SuiteRunner.diff_text_files(base_eio, mod_eio, diff_file))

def test_err_diff_equal_with_ignored_differences(self):
base_eio = os.path.join(self.resources, 'eplusout_base.err')
mod_eio = os.path.join(self.resources, 'eplusout_mod.err')
base_err = os.path.join(self.resources, 'eplusout_base.err')
mod_err = os.path.join(self.resources, 'eplusout_mod.err')
diff_file = os.path.join(self.temp_base_build_dir, 'err.diff')
self.assertEqual(TextDifferences.EQUAL, SuiteRunner.diff_text_files(base_eio, mod_eio, diff_file))
self.assertEqual(TextDifferences.EQUAL, SuiteRunner.diff_text_files(base_err, mod_err, diff_file))

def test_audit_diff_equal_with_ignored_differences(self):
base_audit = os.path.join(self.resources, 'eplusout_base.audit')
mod_audit = os.path.join(self.resources, 'eplusout_mod.audit')
diff_file = os.path.join(self.temp_base_build_dir, 'err.audit')
self.assertEqual(TextDifferences.EQUAL, SuiteRunner.diff_text_files(base_audit, mod_audit, diff_file))

def test_glhe_diff(self):
base_glhe = os.path.join(self.resources, 'eplusout_base.glhe')
Expand Down

0 comments on commit d04aae5

Please sign in to comment.