Merge lp:~javier.collado/utah/bug1169846 into lp:utah

Proposed by Javier Collado
Status: Merged
Approved by: Javier Collado
Approved revision: 875
Merged at revision: 867
Proposed branch: lp:~javier.collado/utah/bug1169846
Merge into: lp:utah
Diff against target: 0 lines
To merge this branch: bzr merge lp:~javier.collado/utah/bug1169846
Reviewer Review Type Date Requested Status
Max Brustkern (community) Approve
Review via email: mp+159821@code.launchpad.net

Description of the change

The changes in this branch take care of displaying an error message that is
less confusing than the original one when there's a timeout for any of the
steps in the syslog messages. In particular, it adds what are the remaining
steps for the install to be successful. For example:
------------
UTAH timeout: Timeout (1) occurred for u'system started' message.
Remaining messages: install started, install complete
------------

Note that the exception type has been changed from UTAHException to UTAHTimeout
to take adavantage of the changes that have been comitted recently regarding
timeout exceptions.

What hasn't been updated are the steps names as has been discussed in the
launchpad bug. Anyway, now I think that it should be clearer that a timeout in
'system started' means that the installation didn't really start since 'install
started' is a remaining step.

To post a comment you must log in.
Revision history for this message
Max Brustkern (nuclearbob) wrote :

This all looks good to me.

review: Approve
lp:~javier.collado/utah/bug1169846 updated
875. By Javier Collado

Make rsyslog timeout error message clearer (LP: #1169846)

Revision history for this message
Andy Doan (doanac) wrote :

thanks for fixing the \n stuff in the exceptions. it was driving me nuts.

think you can come up with a test case for tests/test_rsyslog.py for this new change?

Revision history for this message
Javier Collado (javier.collado) wrote :

@Andy

I didn't see your comment before merging. Yes, I'll write such a test case and
create a new merge proposal.

Preview Diff

Empty

Subscribers

People subscribed via source and target branches