Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Bliss
bliss
Commits
0cee1b75
Commit
0cee1b75
authored
Nov 06, 2020
by
Jibril Mammeri
Browse files
Add axis.name to AxisFaultError and its test
parent
e8b82ce9
Pipeline
#36695
passed with stages
in 87 minutes and 26 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
bliss/common/axis.py
View file @
0cee1b75
...
...
@@ -1915,7 +1915,7 @@ class Axis:
f
"
{
self
.
name
}
:
{
str
(
state
)
}
at
{
self
.
position
}
"
)
elif
state
.
FAULT
:
raise
AxisFaultError
(
str
(
state
))
raise
AxisFaultError
(
f
"
{
self
.
name
}
:
{
str
(
state
)
}
"
)
return
state
gevent
.
sleep
(
polling_time
)
...
...
tests/motors/test_bad_controller.py
View file @
0cee1b75
...
...
@@ -163,9 +163,10 @@ def test_fault_state(bad_motor):
bad_motor
.
controller
.
fault_state
=
True
with
pytest
.
raises
(
AxisFaultError
):
with
pytest
.
raises
(
AxisFaultError
)
as
excinfo
:
bad_motor
.
wait_move
()
assert
bad_motor
.
name
in
str
(
excinfo
.
value
)
bad_motor
.
controller
.
fault_state
=
False
bad_motor
.
move
(
0
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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