Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Charles Burton
Gaudi
Commits
6294aa49
Commit
6294aa49
authored
Nov 29, 2018
by
Marco Clemencic
Browse files
Do not overwrite new reference files for failes tests
if a .new file already exists, use an incremental new name
parent
460fb9dc
Changes
1
Hide whitespace changes
Inline
Side-by-side
GaudiPolicy/python/GaudiTesting/BaseTest.py
View file @
6294aa49
...
...
@@ -472,13 +472,20 @@ class BaseTest(object):
# Compare TTree summaries
causes
=
self
.
CheckTTreesSummaries
(
stdout
,
result
,
causes
)
causes
=
self
.
CheckHistosSummaries
(
stdout
,
result
,
causes
)
if
causes
:
# Write a new reference file for stdout
if
causes
and
lreference
:
# Write a new reference file for stdout
try
:
newref
=
open
(
lreference
+
".new"
,
"w"
)
cnt
=
0
newrefname
=
'.'
.
join
([
lreference
,
'new'
])
while
os
.
path
.
exists
(
newrefname
):
cnt
+=
1
newrefname
=
'.'
.
join
([
lreference
,
'~%d~'
%
cnt
,
'new'
])
newref
=
open
(
newrefname
,
"w"
)
# sanitize newlines
for
l
in
stdout
.
splitlines
():
newref
.
write
(
l
.
rstrip
()
+
'
\n
'
)
del
newref
# flush and close
result
[
'New Output Reference File'
]
=
os
.
path
.
relpath
(
newrefname
,
self
.
basedir
)
except
IOError
:
# Ignore IO errors when trying to update reference files
# because we may be in a read-only filesystem
...
...
@@ -496,12 +503,19 @@ class BaseTest(object):
else
:
newcauses
+=
[
"missing error reference file"
]
causes
+=
newcauses
if
newcauses
:
# Write a new reference file for stdedd
newref
=
open
(
lreference
+
".new"
,
"w"
)
if
newcauses
and
lreference
:
# Write a new reference file for stdedd
cnt
=
0
newrefname
=
'.'
.
join
([
lreference
,
'new'
])
while
os
.
path
.
exists
(
newrefname
):
cnt
+=
1
newrefname
=
'.'
.
join
([
lreference
,
'~%d~'
%
cnt
,
'new'
])
newref
=
open
(
newrefname
,
"w"
)
# sanitize newlines
for
l
in
stderr
.
splitlines
():
newref
.
write
(
l
.
rstrip
()
+
'
\n
'
)
del
newref
# flush and close
result
[
'New Error Reference File'
]
=
os
.
path
.
relpath
(
newrefname
,
self
.
basedir
)
else
:
causes
+=
BasicOutputValidator
(
lreference
,
"standard error"
,
"ExecTest.expected_stderr"
)(
stderr
,
result
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment