Merge into trunk : logging-binary-attachments-1336109 : Code : Autopilot

Status:

Merged

Approved by:

Thomi Richards on 2014-07-03

Approved revision:

499

Merged at revision:

497

Proposed branch:

lp:~veebers/autopilot/logging-binary-attachments-1336109

Merge into:

lp:autopilot

Diff against target:

73 lines (+36/-3)

2 files modified

autopilot/testresult.py (+9/-1)
autopilot/tests/unit/test_testresults.py (+27/-2)

To merge this branch:

bzr merge lp:~veebers/autopilot/logging-binary-attachments-1336109

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2014-07-03
Thomi Richards (community)		2014-07-01	Approve on 2014-07-03
Review via email: mp+225098@code.launchpad.net

Commit message

Fixes bug where attempting to attach/addDetail a binary type to a test result raises an exception.

Description of the change

Fixes bug where attempting to attach/addDetail a binary type to a test result raises an exception.

lp:~veebers/autopilot/logging-binary-attachments-1336109 updated on 2014-07-01

499. By Christopher Lee on 2014-07-01: Removed un-needed use of Mock

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-01:

#

FAILED: Continuous integration, rev:498
http://jenkins.qa.ubuntu.com/job/autopilot-ci/746/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-amd64-ci/20/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-armhf-ci/20/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-i386-ci/20/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-autopilot/144/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1346/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/746/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-01:

#

FAILED: Continuous integration, rev:499
http://jenkins.qa.ubuntu.com/job/autopilot-ci/747/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-amd64-ci/21/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-armhf-ci/21/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-utopic-i386-ci/21/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic-autopilot/145/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1347/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/747/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-03:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/752/rebuild

review: Approve (continuous-integration)

Revision history for this message

Thomi Richards (thomir-deactivatedaccount) on 2014-07-03:

#

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-03:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/autopilot-ci/753/rebuild

review: Approve (continuous-integration)

 === modified file 'autopilot/testresult.py'
 --- autopilot/testresult.py	2014-04-01 01:29:19 +0000
 +++ autopilot/testresult.py	2014-07-01 00:36:55 +0000
@@ -47,11 +47,19 @@
      def _log_details(self, level, details):
          """Log the relavent test details."""
++
          for detail in details:
              # Skip the test-log as it was logged while the test executed
              if detail == "test-log":
                  continue
--            text = "%s: {{{\n%s}}}" % (detail, details[detail].as_text())
++            detail_content = details[detail]
++            if detail_content.content_type.type == "text":
++                text = "%s: {{{\n%s}}}" % (detail, detail_content.as_text())
++            else:
++                text = "Binary attachment: \"%s\" (%s)" % (
++                    detail,
++                    detail_content.content_type
++                )
              self._log(level, text)
      def addSuccess(self, test, details=None):
 === modified file 'autopilot/tests/unit/test_testresults.py'
 --- autopilot/tests/unit/test_testresults.py	2014-05-20 08:53:21 +0000
 +++ autopilot/tests/unit/test_testresults.py	2014-07-01 00:36:55 +0000
@@ -18,11 +18,11 @@
+ #
  import codecs
--from unittest.mock import Mock
++from unittest.mock import Mock, patch
  import os
  import tempfile
  from testtools import TestCase, PlaceHolder
--from testtools.content import text_content
++from testtools.content import Content, ContentType, text_content
  from testtools.matchers import Contains, raises, NotEquals
  from testscenarios import WithScenarios
  import unittest
@@ -82,6 +82,31 @@
              details=fake_details
+         )
++    def test_log_details_handles_binary_data(self):
++        fake_details = dict(
++            TestBinary=Content(ContentType('image', 'png'), lambda: b'')
++        )
++
++        result = testresult.LoggedTestResultDecorator(None)
++        result._log_details(0, fake_details)
++
++    def test_log_details_logs_binary_attachment_details(self):
++        fake_details = dict(
++            TestBinary=Content(ContentType('image', 'png'), lambda: b'')
++        )
++
++        result = testresult.LoggedTestResultDecorator(None)
++        with patch.object(result, '_log') as p_log:
++            result._log_details(0, fake_details)
++
++            p_log.assert_called_once_with(
++                0,
++                "Binary attachment: \"{name}\" ({type})".format(
++                    name="TestBinary",
++                    type="image/png"
++                )
++            )
++
  class OutputFormatFactoryTests(TestCase):

Autopilot

Merge lp:~veebers/autopilot/logging-binary-attachments-1336109 into lp:autopilot

Commit message

Description of the change

Preview Diff

Subscribers