Snappy Scope

Merge lp://staging/~kyrofa/unity-scope-snappy/update_godbus_testability into lp://staging/~unity-api-team/unity-scope-snappy/trunk

  1. update_godbus_testability
  2. Merge into trunk
Proposed by Kyle Fazzari
Status: Merged
Approved by: dobey
Approved revision: 36
Merged at revision: 36
Proposed branch: lp://staging/~kyrofa/unity-scope-snappy/update_godbus_testability
Merge into: lp://staging/~unity-api-team/unity-scope-snappy/trunk
Diff against target: 796 lines (+327/-311)
7 files modified
internal/github.com/AlekSi/gocov-xml/coverage-with-data.xml (+0/-179)
internal/github.com/godbus/dbus/call.go (+0/-111)
internal/github.com/godbus/dbus/conn.go (+13/-7)
internal/github.com/godbus/dbus/export.go (+61/-9)
internal/github.com/godbus/dbus/export_test.go (+122/-0)
internal/github.com/godbus/dbus/object.go (+126/-0)
internal/vendor.json (+5/-5)
To merge this branch: bzr merge lp://staging/~kyrofa/unity-scope-snappy/update_godbus_testability
Reviewer Review Type Date Requested Status
Antti Kaijanmäki (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+266230@code.staging.launchpad.net

Commit message

Update godbus to include testability patch.

Description of the change

Update godbus to include testability patch.

The changes contained within this MP are all from the upstream vendored dependency.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:34
http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-ci/131/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-amd64-ci/88
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-armhf-ci/85
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-armhf-ci/85/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-i386-ci/85

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-snappy-ci/131/rebuild

review: Approve (continuous-integration)
lp://staging/~kyrofa/unity-scope-snappy/update_godbus_testability updated
35. By Kyle Fazzari

Remove example xml file from gocov-xml.

It is now getting loaded as valid coverage data, which it's obviously
not.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:35
http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-ci/133/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-amd64-ci/90
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-armhf-ci/87
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-armhf-ci/87/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-i386-ci/87

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-snappy-ci/133/rebuild

review: Approve (continuous-integration)
lp://staging/~kyrofa/unity-scope-snappy/update_godbus_testability updated
36. By Kyle Fazzari

Pull a few more patches from godbus.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:36
http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-ci/136/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-amd64-ci/93
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-armhf-ci/90
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-armhf-ci/90/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-snappy-wily-i386-ci/90

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-snappy-ci/136/rebuild

review: Approve (continuous-integration)
Revision history for this message
Antti Kaijanmäki (kaijanmaki) wrote :

Trivial.

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