Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
slapos.core
Commits
734e90ad
Commit
734e90ad
authored
Dec 03, 2012
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Comment out _formatXMLError."
This reverts commit
5f90be47
.
parent
5f90be47
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
8 deletions
+5
-8
slapos/grid/slapgrid.py
slapos/grid/slapgrid.py
+5
-8
No files found.
slapos/grid/slapgrid.py
View file @
734e90ad
...
@@ -276,7 +276,7 @@ def parseArgumentTupleAndReturnSlapgridObject(*argument_tuple):
...
@@ -276,7 +276,7 @@ def parseArgumentTupleAndReturnSlapgridObject(*argument_tuple):
maximal_delay
=
int
(
option_dict
.
get
(
"maximal_delay"
,
"0"
))
maximal_delay
=
int
(
option_dict
.
get
(
"maximal_delay"
,
"0"
))
if
maximal_delay
>
0
:
if
maximal_delay
>
0
:
duration
=
int
(
maximal_delay
*
random
())
duration
=
int
(
maximal_delay
*
random
())
logging
.
info
(
"Sleeping for %s seconds. To disable this feature, "
logging
.
info
(
"Sleeping for %s seconds. To disable this feature, "
\
"check --now parameter in slapgrid help."
%
duration
)
"check --now parameter in slapgrid help."
%
duration
)
time
.
sleep
(
duration
)
time
.
sleep
(
duration
)
...
@@ -975,10 +975,9 @@ class Slapgrid(object):
...
@@ -975,10 +975,9 @@ class Slapgrid(object):
try
:
try
:
document
=
etree
.
parse
(
string_to_validate
)
document
=
etree
.
parse
(
string_to_validate
)
except
(
etree
.
XMLSyntaxError
,
etree
.
DocumentInvalid
)
as
e
:
except
(
etree
.
XMLSyntaxError
,
etree
.
DocumentInvalid
)
as
e
:
logger
.
info
(
'Failed to parse this XML report : %s'
%
to_be_validated
)
logger
.
info
(
'Failed to parse this XML report : %s
\
n
%s'
%
\
# XXX-Cedric: _formatXMLError has never been commited.
(
to_be_validated
,
_formatXMLError
(
e
)))
#logger.error(_formatXMLError(e))
logger
.
error
(
_formatXMLError
(
e
))
logger
.
error
(
e
)
return
False
return
False
if
xmlschema
.
validate
(
document
):
if
xmlschema
.
validate
(
document
):
...
@@ -1022,9 +1021,7 @@ class Slapgrid(object):
...
@@ -1022,9 +1021,7 @@ class Slapgrid(object):
except
(
etree
.
XMLSyntaxError
,
etree
.
DocumentInvalid
)
as
e
:
except
(
etree
.
XMLSyntaxError
,
etree
.
DocumentInvalid
)
as
e
:
self
.
logger
.
info
(
"Failed to parse %s."
%
(
usage_string
))
self
.
logger
.
info
(
"Failed to parse %s."
%
(
usage_string
))
self
.
logger
.
error
(
e
)
self
.
logger
.
error
(
e
)
# XXX-Cedric: _formatXMLError has never been commited.
raise
_formatXMLError
(
e
)
#raise _formatXMLError(e)
raise
except
Exception
:
except
Exception
:
raise
"Failed to generate XML report."
raise
"Failed to generate XML report."
...
...
Write
Preview
Markdown
is supported
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