Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cancel state #1758

Merged
merged 11 commits into from
Nov 21, 2019
Next Next commit
Rename Aborted -> Cancelled
  • Loading branch information
cicdw committed Nov 19, 2019
commit 6b2802dce0d73ab6ba374a558b31d57f1615bb69
2 changes: 1 addition & 1 deletion docs/outline.toml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ classes = [
"Mapped",
"Skipped",
"Failed",
"Aborted",
"Cancelled",
"TriggerFailed",
"TimedOut",
]
Expand Down
4 changes: 2 additions & 2 deletions src/prefect/engine/state.py
Original file line number Diff line number Diff line change
Expand Up @@ -700,9 +700,9 @@ def __init__(
self.cached_inputs = cached_inputs


class Aborted(Failed):
class Cancelled(Failed):
"""
Finished state indicating that a user aborted the flow run manually.
Finished state indicating that a user cancelled the flow run manually, mid-run.

Args:
- message (str or Exception, optional): Defaults to `None`. A message about the
Expand Down
6 changes: 3 additions & 3 deletions src/prefect/serialization/state.py
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,9 @@ class Meta:
)


class AbortedSchema(FailedSchema):
class CancelledSchema(FailedSchema):
class Meta:
object_class = state.Aborted
object_class = state.Cancelled


class TimedOutSchema(FinishedSchema):
Expand Down Expand Up @@ -203,7 +203,7 @@ class StateSchema(OneOfSchema):

# map class name to schema
type_schemas = {
"Aborted": AbortedSchema,
"Cancelled": CancelledSchema,
"Cached": CachedSchema,
"ClientFailed": ClientFailedSchema,
"Failed": FailedSchema,
Expand Down
8 changes: 4 additions & 4 deletions tests/engine/test_state.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from prefect.engine.result import NoResult, Result, SafeResult
from prefect.engine.result_handlers import JSONResultHandler, LocalResultHandler
from prefect.engine.state import (
Aborted,
Cancelled,
Cached,
ClientFailed,
Failed,
Expand Down Expand Up @@ -359,8 +359,8 @@ def test_success_is_finished(self):
def test_failed_is_finished(self):
assert issubclass(Failed, Finished)

def test_aborted_is_failed(self):
assert issubclass(Aborted, Failed)
def test_cancelled_is_failed(self):
assert issubclass(Cancelled, Failed)

def test_trigger_failed_is_finished(self):
assert issubclass(TriggerFailed, Finished)
Expand All @@ -384,7 +384,7 @@ def test_trigger_failed_is_failed(self):
@pytest.mark.parametrize(
"state_check",
[
dict(state=Aborted(), assert_true={"is_finished", "is_failed"}),
dict(state=Cancelled(), assert_true={"is_finished", "is_failed"}),
dict(state=Cached(), assert_true={"is_cached", "is_finished", "is_successful"}),
dict(state=ClientFailed(), assert_true={"is_meta_state"}),
dict(state=Failed(), assert_true={"is_finished", "is_failed"}),
Expand Down