Skip to content

Commit

Permalink
rework: test harness fix (#526)
Browse files Browse the repository at this point in the history
* fixed test harness to remove output files
  • Loading branch information
PaulTalbot-INL authored and wangcj05 committed Jan 17, 2018
1 parent 984410c commit 54348a6
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 43 deletions.
4 changes: 3 additions & 1 deletion scripts/TestHarness/testers/RavenFramework.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ def __init__(self, name, params):
self.uxml_files = self.specs['UnorderedXml'].split(" ") if len(self.specs['UnorderedXml']) > 0 else []
self.text_files = self.specs['text' ].split(" ") if len(self.specs['text' ]) > 0 else []
self.img_files = self.specs['image' ].split(" ") if len(self.specs['image' ]) > 0 else []
self.all_files = self.check_files + self.csv_files + self.xml_files + self.ucsv_files + self.uxml_files + self.text_files + self.img_files
self.required_executable = self.specs['required_executable']
self.required_libraries = self.specs['required_libraries'].split(' ') if len(self.specs['required_libraries']) > 0 else []
self.minimum_libraries = self.specs['minimum_library_versions'].split(' ') if len(self.specs['minimum_library_versions']) > 0 else []
Expand Down Expand Up @@ -176,7 +177,8 @@ def __getCreatedFiles(self):
the test.
@ Out, createdFiles, [str], list of files created by the test.
"""
return self.check_files + self.csv_files+self.xml_files+self.ucsv_files+self.uxml_files+self.img_files
runpath = self.getTestDir()
return list(os.path.join(runpath,file) for file in self.all_files)

def prepare(self, options = None):
self.check_files = [os.path.join(self.specs['test_dir'],filename) for filename in self.check_files]
Expand Down
22 changes: 11 additions & 11 deletions tests/framework/Samplers/Restart/gold/mc/coarse.csv
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
x1,x2,ans,ProbabilityWeight,ProbabilityWeight-x2,prefix,PointProbability,ProbabilityWeight-x1
1.99718480837,2.41702199853,1.0,1.0,1.0,1,1.0,1.0
1.93255736142,2.72032448946,1.0,1.0,1.0,2,1.0,1.0
1.1281244478,2.00011438108,1.0,1.0,1.0,3,1.0,1.0
1.99904051563,2.30233256782,1.0,1.0,1.0,4,1.0,1.0
1.23608897632,2.14675589258,1.0,1.0,1.0,5,1.0,1.0
1.39658072623,2.09233859556,1.0,1.0,1.0,6,1.0,1.0
1.38791074031,2.18626021132,1.0,1.0,1.0,7,1.0,1.0
1.66974604052,2.34556072516,1.0,1.0,1.0,8,1.0,1.0
1.93553907283,2.39676746875,1.0,1.0,1.0,9,1.0,1.0
1.84631091842,2.53881673201,1.0,1.0,1.0,10,1.0,1.0
x1,x2,ans
1.99718480837,2.41702199853,1.0
1.93255736142,2.72032448946,1.0
1.1281244478,2.00011438108,1.0
1.99904051563,2.30233256782,1.0
1.23608897632,2.14675589258,1.0
1.39658072623,2.09233859556,1.0
1.38791074031,2.18626021132,1.0
1.66974604052,2.34556072516,1.0
1.93553907283,2.39676746875,1.0
1.84631091842,2.53881673201,1.0
30 changes: 15 additions & 15 deletions tests/framework/Samplers/Restart/gold/mc/fine.csv
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
x1,x2,ans
1.9971848083653452,2.4170219985342172,2.0
1.9325573614175799,2.7203244894557459,2.0
1.1281244478021106,2.00011438108052,2.0
1.9990405156274886,2.3023325678199371,2.0
1.2360889763189686,2.1467558925847419,2.0
1.3965807262334462,2.0923385955608307,2.0
1.3879107403075115,2.1862602113248455,2.0
1.6697460405225275,2.3455607251603063,2.0
1.9355390728301227,2.396767468749724,2.0
1.8463109184164348,2.5388167320142538,2.0
1.3132735130640849,2.4191945191517461,2.0
1.5245481628283271,2.6852195008390627,2.0
1.4434528938595794,2.2044522490362759,2.0
1.2295772200984827,2.8781174372132208,2.0
1.5344139073357019,2.0273875959746976,2.0
1.99718480837,2.41702199853,2.0
1.93255736142,2.72032448946,2.0
1.1281244478,2.00011438108,2.0
1.99904051563,2.30233256782,2.0
1.23608897632,2.14675589258,2.0
1.39658072623,2.09233859556,2.0
1.38791074031,2.18626021132,2.0
1.66974604052,2.34556072516,2.0
1.93553907283,2.39676746875,2.0
1.84631091842,2.53881673201,2.0
1.31327351306,2.41919451915,2.0
1.52454816283,2.68521950084,2.0
1.44345289386,2.20445224904,2.0
1.2295772201,2.87811743721,2.0
1.53441390734,2.02738759597,2.0
30 changes: 15 additions & 15 deletions tests/framework/Samplers/Restart/gold/mc/restart.csv
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
x1,x2,ans
1.9971848083653452,2.4170219985342172,1.0
1.9325573614175799,2.7203244894557459,1.0
1.1281244478021106,2.00011438108052,1.0
1.9990405156274886,2.3023325678199371,1.0
1.2360889763189686,2.1467558925847419,1.0
1.3965807262334462,2.0923385955608307,1.0
1.3879107403075115,2.1862602113248455,1.0
1.6697460405225275,2.3455607251603063,1.0
1.9355390728301227,2.396767468749724,1.0
1.8463109184164348,2.5388167320142538,1.0
1.3132735130640849,2.4191945191517461,2.0
1.5245481628283271,2.6852195008390627,2.0
1.4434528938595794,2.2044522490362759,2.0
1.2295772200984827,2.8781174372132208,2.0
1.5344139073357019,2.0273875959746976,2.0
1.99718480837,2.41702199853,1.0
1.93255736142,2.72032448946,1.0
1.1281244478,2.00011438108,1.0
1.99904051563,2.30233256782,1.0
1.23608897632,2.14675589258,1.0
1.39658072623,2.09233859556,1.0
1.38791074031,2.18626021132,1.0
1.66974604052,2.34556072516,1.0
1.93553907283,2.39676746875,1.0
1.84631091842,2.53881673201,1.0
1.31327351306,2.41919451915,2.0
1.52454816283,2.68521950084,2.0
1.44345289386,2.20445224904,2.0
1.2295772201,2.87811743721,2.0
1.53441390734,2.02738759597,2.0
2 changes: 1 addition & 1 deletion tests/framework/Samplers/Restart/test_restart_MC.xml
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
<Print name="coarse">
<type>csv</type>
<source>solns</source>
<what>input,outpu</what>
<what>input,output</what>
</Print>
<Print name="fine">
<type>csv</type>
Expand Down

0 comments on commit 54348a6

Please sign in to comment.