MAAS

Merge lp:~allenap/maas/pretty-error-message--bug-1412026 into lp:~maas-committers/maas/trunk

  1. pretty-error-message--bug-1412026
  2. Merge into trunk
Proposed by Gavin Panella
Status: Merged
Approved by: Gavin Panella
Approved revision: no longer in the source branch.
Merged at revision: 3846
Proposed branch: lp:~allenap/maas/pretty-error-message--bug-1412026
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 39 lines (+9/-2)
2 files modified
src/provisioningserver/pserv_services/image_download_service.py (+1/-1)
src/provisioningserver/pserv_services/tests/test_image_download_service.py (+8/-1)
To merge this branch: bzr merge lp:~allenap/maas/pretty-error-message--bug-1412026
Reviewer Review Type Date Requested Status
Blake Rouse (community) Approve
Review via email: mp+257633@code.launchpad.net

Commit message

Provide an explanation for crashes in the image download service.

This helps prevent us from misdiagnosing tracebacks as critical crashes.

To post a comment you must log in.
Revision history for this message
Blake Rouse (blake-rouse) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/provisioningserver/pserv_services/image_download_service.py'
2--- src/provisioningserver/pserv_services/image_download_service.py 2015-03-25 15:33:23 +0000
3+++ src/provisioningserver/pserv_services/image_download_service.py 2015-04-28 11:44:46 +0000
4@@ -69,7 +69,7 @@
5 the maas log.
6 """
7 def download_failure(failure):
8- log.err(failure)
9+ log.err(failure, "Downloading images failed.")
10 maaslog.error(
11 "Failed to download images: %s", failure.getErrorMessage())
12
13
14=== modified file 'src/provisioningserver/pserv_services/tests/test_image_download_service.py'
15--- src/provisioningserver/pserv_services/tests/test_image_download_service.py 2015-03-25 15:33:23 +0000
16+++ src/provisioningserver/pserv_services/tests/test_image_download_service.py 2015-04-28 11:44:46 +0000
17@@ -185,7 +185,7 @@
18 maybe_start_download.return_value = defer.fail(
19 ZeroDivisionError("Such a shame I can't divide by zero"))
20
21- with FakeLogger("maas") as maaslog, TwistedLoggerFixture():
22+ with FakeLogger("maas") as maaslog, TwistedLoggerFixture() as logger:
23 d = service.try_download()
24
25 self.assertEqual(None, extract_result(d))
26@@ -193,6 +193,13 @@
27 "Failed to download images: "
28 "Such a shame I can't divide by zero",
29 maaslog.output)
30+ self.assertDocTestMatches(
31+ """\
32+ Downloading images failed.
33+ Traceback (most recent call last):
34+ Failure: exceptions.ZeroDivisionError: Such a shame ...
35+ """,
36+ logger.output)
37
38
39 class TestGetBootSources(PservTestCase):