Skip to content

Commit

Permalink
Merge pull request #42 from ClusterHQ/latest-eliot-41
Browse files Browse the repository at this point in the history
Eliot 0.6 changes the way task levels are structured.

Fixes #41.
  • Loading branch information
itamarst committed Jan 27, 2015
2 parents 0928afb + b330929 commit 87eaac4
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
19 changes: 10 additions & 9 deletions machinist/test/test_fsm.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

WrongState, stateful,

LOG_FSM_INITIALIZE,
LOG_FSM_TRANSITION,
)

Expand Down Expand Up @@ -861,16 +862,16 @@ def test_terminalLogging(self, logger):

fsm.receive(Gravenstein())

self.assertTrue(
issuperset(logger.messages[3], {
u"fsm_terminal_state": u"<MoreState=blue>",
# Prove it associates with the initialization action.
u"action_type": u"fsm:initialize",
u"action_status": u"succeeded",
u"task_uuid": logger.messages[0][u"task_uuid"],
u"task_level": u"/",
}))
(initialize,) = LoggedAction.of_type(
logger.messages, LOG_FSM_INITIALIZE
)

assertContainsFields(
self, initialize.end_message, {
u"fsm_terminal_state": u"<MoreState=blue>",
u"action_status": u"succeeded",
}
)

@validateLogging(None)
def test_noRepeatedTerminalLogging(self, logger):
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

# For the convenience of the travis configuration, make this information
# particularly easy to find. See .travis.yml.
_MINIMUM_ELIOT_VERSION = "0.4.0"
_MINIMUM_ELIOT_VERSION = "0.5.0"

if __name__ == '__main__':
setup(
Expand Down

0 comments on commit 87eaac4

Please sign in to comment.