← Back to branch summary

~andrewjbeach/juju-ci-tools/model-migration-superuser

« back to all changes in this revision

Viewing changes to jujupy.py

  • Committer: Andrew Beach
  • Date: 2016-12-02 20:18:50 UTC
  • mfrom: (1772.1.3 fix-datetime-since)
  • Revision ID: andrew.beach@canonical.com-20161202201850-56by291ol664srta
Merged in latest fix to datetime_since.

Show diffs side-by-side

added added

removed removed

Lines of Context:
jujupy.py
749
749
            else:
750
750
                return MachineError(self.item_name, self.message)
751
751
        elif self.JUJU == self.status_name:
 
752
            if self.since is None:
 
753
                return AgentError(self.item_name, self.message)
752
754
            time_since = datetime.now(tz.gettz('UTC')) - self.datetime_since
753
755
            if time_since > AgentUnresolvedError.a_reasonable_time:
754
756
                return AgentUnresolvedError(self.item_name, self.message,