Merge lp://qastaging/~jml/txpkgme/tell-about-cronjob into lp://qastaging/txpkgme

Proposed by Jonathan Lange
Status: Merged
Approved by: James Westby
Approved revision: 35
Merged at revision: 34
Proposed branch: lp://qastaging/~jml/txpkgme/tell-about-cronjob
Merge into: lp://qastaging/txpkgme
Diff against target: 104 lines (+28/-13)
3 files modified
txpkgme/check_submit.py (+7/-4)
txpkgme/submitfromdisk.py (+4/-3)
txpkgme/tests/test_submitfromdisk.py (+17/-6)
To merge this branch: bzr merge lp://qastaging/~jml/txpkgme/tell-about-cronjob
Reviewer Review Type Date Requested Status
James Westby (community) Approve
Review via email: mp+121058@code.qastaging.launchpad.net

Commit message

Say where the output file lives and refer to the cronjob when e2e check fails

Description of the change

It's sometimes a little bit confusing when there's an end-to-end check failure,
because the nagios check doesn't actually do the check -- it reads from a cronjob.

Rather than having to remind ourselves of this all the time, I've put a note
in the check failure, pointing to where the file is and mentioning the cronjob.

Failed checks will now look like this::
    Check failed in 12.400000: SOME ERROR. NB: Based on results stored in 'filename' by a cronjob

This changes the interface to check_saved_output to take the filename. It's
not ideal, as its first argument 'output' is the contents of that filename,
but I think it'll do for this.

While here, I changed the main() bit to use 'filename' rather than args[0],
and filled in a missing '%s' in the error when the file doesn't exist.

Thanks,
jml

To post a comment you must log in.
Revision history for this message
Jonathan Lange (jml) wrote :

<mthaddon> yeah, error message seems sane to me

Revision history for this message
James Westby (james-w) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches