Skip to content

Commit a317abc

Browse files
committed
tests: status.state should be checked against command execution status
1 parent 5bd49cb commit a317abc

8 files changed

Lines changed: 8 additions & 8 deletions

File tree

lib/python/linuxcnc_util.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def wait_for_linuxcnc_startup(self, timeout=10.0):
5454
or (self.status.max_velocity == 0.0) \
5555
or (self.status.program_units == 0.0) \
5656
or (self.status.rapidrate == 0.0) \
57-
or (self.status.state != linuxcnc.STATE_ESTOP) \
57+
or (self.status.state != linuxcnc.RCS_DONE) \
5858
or (self.status.task_state != linuxcnc.STATE_ESTOP):
5959
time.sleep(0.1)
6060
else:

tests/abort/feed-rate/test-ui.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def wait_for_linuxcnc_startup(status, timeout=10.0):
3333
or (status.max_velocity == 0.0) \
3434
or (status.program_units == 0.0) \
3535
or (status.rapidrate == 0.0) \
36-
or (status.state != linuxcnc.STATE_ESTOP) \
36+
or (status.state != linuxcnc.RCS_DONE) \
3737
or (status.task_state != linuxcnc.STATE_ESTOP):
3838
time.sleep(0.1)
3939
else:

tests/ccomp/early-exit/test-ui.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def wait_for_linuxcnc_startup(status, timeout=10.0):
3333
or (status.max_velocity == 0.0) \
3434
or (status.program_units == 0.0) \
3535
or (status.rapidrate == 0.0) \
36-
or (status.state != linuxcnc.STATE_ESTOP) \
36+
or (status.state != linuxcnc.RCS_DONE) \
3737
or (status.task_state != linuxcnc.STATE_ESTOP):
3838
time.sleep(0.1)
3939
else:

tests/interp/oword-mdi-sub-update/test-ui.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def wait_for_linuxcnc_startup(status, timeout=10.0):
2929
or (status.max_velocity == 0.0) \
3030
or (status.program_units == 0.0) \
3131
or (status.rapidrate == 0.0) \
32-
or (status.state != linuxcnc.STATE_ESTOP) \
32+
or (status.state != linuxcnc.RCS_DONE) \
3333
or (status.task_state != linuxcnc.STATE_ESTOP):
3434
time.sleep(0.1)
3535
else:

tests/mdi-queue-length/test-ui.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def wait_for_linuxcnc_startup(status, timeout=10.0):
3333
or (status.max_velocity == 0.0) \
3434
or (status.program_units == 0.0) \
3535
or (status.rapidrate == 0.0) \
36-
or (status.state != linuxcnc.STATE_ESTOP) \
36+
or (status.state != linuxcnc.RCS_DONE) \
3737
or (status.task_state != linuxcnc.STATE_ESTOP):
3838
time.sleep(0.1)
3939
else:

tests/tool-info/non-random/test-ui.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def wait_for_linuxcnc_startup(status, timeout=10.0):
3333
or (status.max_velocity == 0.0) \
3434
or (status.program_units == 0.0) \
3535
or (status.rapidrate == 0.0) \
36-
or (status.state != linuxcnc.STATE_ESTOP) \
36+
or (status.state != linuxcnc.RCS_DONE) \
3737
or (status.task_state != linuxcnc.STATE_ESTOP):
3838
time.sleep(0.1)
3939
else:

tests/tool-info/random-no-startup-tool/test-ui.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def wait_for_linuxcnc_startup(status, timeout=10.0):
3333
or (status.max_velocity == 0.0) \
3434
or (status.program_units == 0.0) \
3535
or (status.rapidrate == 0.0) \
36-
or (status.state != linuxcnc.STATE_ESTOP) \
36+
or (status.state != linuxcnc.RCS_DONE) \
3737
or (status.task_state != linuxcnc.STATE_ESTOP):
3838
time.sleep(0.1)
3939
else:

tests/tool-info/random-with-startup-tool/test-ui.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def wait_for_linuxcnc_startup(status, timeout=10.0):
3333
or (status.max_velocity == 0.0) \
3434
or (status.program_units == 0.0) \
3535
or (status.rapidrate == 0.0) \
36-
or (status.state != linuxcnc.STATE_ESTOP) \
36+
or (status.state != linuxcnc.RCS_DONE) \
3737
or (status.task_state != linuxcnc.STATE_ESTOP):
3838
time.sleep(0.1)
3939
else:

0 commit comments

Comments
 (0)