Commit 0c97c693 authored by Marco Clemencic's avatar Marco Clemencic

Merge branch 'fix-test-race-condition'

Fix race condition between tests

See merge request !1074
parents cc1f2cb7 183676f2
......@@ -47,7 +47,7 @@ ApplicationMgr.EvtSel = "NONE";
//ApplicationMgr.HistogramPersistency = "HBOOK";
//HbookHistSvc.OutputFile = "histo.hbook";
ApplicationMgr.HistogramPersistency = "ROOT";
RootHistSvc.OutputFile = "histo.root";
RootHistSvc.OutputFile = "histo-opts.root";
//NTupleSvc.Output = { "FILE1 DATAFILE='NTuple.hbook' OPT='NEW' TYP='HBOOK'" };
//NTupleSvc.Output = { "FILE1 DATAFILE='NTuple.root' OPT='NEW' TYP='ROOT'" };
......
......@@ -45,7 +45,7 @@ except TypeError:
pass # this is expected
app.HistogramPersistency = 'ROOT'
C.RootHistCnv.PersSvc('RootHistSvc', OutputFile='histo.root')
C.RootHistCnv.PersSvc('RootHistSvc', OutputFile='histo-c2g.root')
C.HistogramSvc(
'HistogramDataSvc',
......
......@@ -47,7 +47,7 @@ def adjustLogLevels(config):
return config
def main(nevt=50000, outfile='histo.root', OutputLevel=3):
def main(nevt=50000, outfile='histo-c2.root', OutputLevel=3):
msgSvc = C.MessageSvc(OutputLevel=3)
app = C.ApplicationMgr(MessageSvcType=msgSvc)
return adjustLogLevels(
......
......@@ -13,5 +13,5 @@
<argument name="program"><text>gaudirun.py</text></argument>
<argument name="args"><set><text>GaudiExamples.TestConfig2:main</text></set></argument>
<argument name="use_temp_dir"><enumeral>true</enumeral></argument>
<argument name="reference"><text>refs/Histograms.ref</text></argument>
<argument name="reference"><text>refs/config2/Histograms.ref</text></argument>
</extension>
......@@ -13,5 +13,5 @@
<argument name="program"><text>gaudirun.py</text></argument>
<argument name="args"><set><text>$GAUDIEXAMPLESROOT/options/Histograms_with_global.py</text></set></argument>
<argument name="use_temp_dir"><enumeral>true</enumeral></argument>
<argument name="reference"><text>refs/Histograms.ref</text></argument>
<argument name="reference"><text>refs/config2/Histograms_wg.ref</text></argument>
</extension>
......@@ -17,7 +17,7 @@ JobOptionsSvc INFO # (35,1): Histos2.Histo2 = [-5, 5, 200]
JobOptionsSvc INFO # (41,1): ApplicationMgr.EvtMax = 50000
JobOptionsSvc INFO # (42,1): ApplicationMgr.EvtSel = "NONE"
JobOptionsSvc INFO # (49,1): ApplicationMgr.HistogramPersistency = "ROOT"
JobOptionsSvc INFO # (50,1): RootHistSvc.OutputFile = "histo.root"
JobOptionsSvc INFO # (50,1): RootHistSvc.OutputFile = "histo-opts.root"
JobOptionsSvc INFO # (59,1): HistogramDataSvc.Input = ["InFile DATAFILE='../data/input.hbook' TYP='HBOOK'"]
JobOptionsSvc INFO # (61,1): HistogramDataSvc.Predefined1DHistos = {"/stat/Histos2/2":["TEST2", -100, 200]}
JobOptionsSvc INFO # (65,1): HistogramDataSvc.OutputLevel = 2
......@@ -86,7 +86,7 @@ SimpleHistos DEBUG Property ['Name': Value] = 'ExtraOutputs':[]
SimpleHistos DEBUG Property ['Name': Value] = 'ExtraInputs':[]
HistogramDataSvc DEBUG Property update for OutputLevel : new value = 2
HistogramDataSvc DEBUG Service base class initialized successfully
RootHistSvc INFO Writing ROOT histograms to: histo.root
RootHistSvc INFO Writing ROOT histograms to: histo-opts.root
HistogramPersis... INFO Added successfully Conversion service:RootHistSvc
HistogramDataSvc INFO Predefined 1D-Histograms:
HistogramDataSvc INFO Path='Histos2/2' Description ('TEST2',-100,200,100)
......
......@@ -17,7 +17,7 @@ JobOptionsSvc INFO # (35,1): Histos2.Histo2 = [-5, 5, 200]
JobOptionsSvc INFO # (41,1): ApplicationMgr.EvtMax = 50000
JobOptionsSvc INFO # (42,1): ApplicationMgr.EvtSel = "NONE"
JobOptionsSvc INFO # (49,1): ApplicationMgr.HistogramPersistency = "ROOT"
JobOptionsSvc INFO # (50,1): RootHistSvc.OutputFile = "histo.root"
JobOptionsSvc INFO # (50,1): RootHistSvc.OutputFile = "histo-opts.root"
JobOptionsSvc INFO # (61,1): HistogramDataSvc.Predefined1DHistos = {"/stat/Histos2/2":["TEST2", -100, 200]}
JobOptionsSvc INFO # (65,1): HistogramDataSvc.OutputLevel = 2
JobOptionsSvc INFO Job options successfully read in from /home/marco/Devel/workspace/Gaudi/GaudiExamples/options/Histograms.opts
......@@ -83,7 +83,7 @@ SimpleHistos DEBUG Property ['Name': Value] = 'ExtraOutputs':[]
SimpleHistos DEBUG Property ['Name': Value] = 'ExtraInputs':[]
HistogramDataSvc DEBUG Property update for OutputLevel : new value = 2
HistogramDataSvc DEBUG Service base class initialized successfully
RootHistSvc INFO Writing ROOT histograms to: histo.root
RootHistSvc INFO Writing ROOT histograms to: histo-opts.root
HistogramPersis... INFO Added successfully Conversion service:RootHistSvc
HistogramDataSvc INFO Predefined 1D-Histograms:
HistogramDataSvc INFO Path='Histos2/2' Description ('TEST2',-100,200,100)
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment