~hazmat/pyjuju/preserve-unit-for-external-gc

« back to all changes in this revision

Viewing changes to juju/agents/tests/test_unit.py

  • Committer: kapil.thangavelu at canonical
  • Date: 2011-10-14 15:54:08 UTC
  • mfrom: (402.1.1 retry-sans-hook)
  • Revision ID: kapil.thangavelu@canonical.com-20111014155408-0o9qto1woa219pmm
merge retry-sans-hook [r=fwereade,jimbaker][f=814987]

Fixes a bug with unit agent usage of resolved flags that caused
resolved to always execute hooks, instead of when hook retry was
explicitly specified.

Show diffs side-by-side

added added

removed removed

Lines of Context:
443
443
            "start_error", (yield self.agent.workflow.get_state()))
444
444
 
445
445
        state_deferred = self.wait_on_state(self.agent.workflow, "started")
446
 
        self.write_hook("start", "#!/bin/sh\nexit 0")
447
446
        yield self.agent.unit_state.set_resolved(NO_HOOKS)
448
447
        yield state_deferred
449
448
        self.assertEqual("started", (yield self.agent.workflow.get_state()))