Merge into trunk : last-minute-fixes : Code : messaging-framework

Status:	Merged
Approved by:	Tiago Salem Herrmann on 2016-10-14
Approved revision:	75
Merged at revision:	68
Proposed branch:	lp://qastaging/~phablet-team/messaging-framework/last-minute-fixes
Merge into:	lp://qastaging/messaging-framework
Prerequisite:	lp://qastaging/~phablet-team/messaging-framework/self-id
Diff against target:	136 lines (+29/-14) 5 files modified include/messaging/group_manager.h (+3/-0) include/messaging/qt/tp/text_channel.h (+1/-0) src/messaging/qt/tp/connection.cpp (+5/-4) src/messaging/qt/tp/text_channel.cpp (+19/-10) tests/mock_group_manager.h (+1/-0)
To merge this branch:	bzr merge lp://qastaging/~phablet-team/messaging-framework/last-minute-fixes
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
system-apps-ci-bot	continuous-integration		Approve on 2016-10-14
Tiago Salem Herrmann (community)		2016-10-09	Approve on 2016-10-14
Review via email: mp+308008@code.qastaging.launchpad.net

Commit message

Bunch of last minute fixes:
- adding selfID along with selfHandle
- using connection->group_admin_ids to know who are the admins, and compare with selfID to know if we are admin also, instead of querying existing members and guess.

NOTE: This branch should be landed along with https://code.launchpad.net/~ningbo-team/ningbo/last-minute-fixes/+merge/308007

Description of the change

Bunch of last minute fixes:
- adding selfID along with selfHandle
- using connection->group_admin_ids to know who are the admins, and compare with selfID to know if we are admin also, instead of querying existing members and guess.

NOTE: This branch should be landed along with https://code.launchpad.net/~ningbo-team/ningbo/last-minute-fixes/+merge/308007

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) wrote on 2016-10-13:

#

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/87/rebuild

FAILED: Continuous integration, rev:75
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/87/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1834/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1835
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1675
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1675/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1675
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1675/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1675
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1675/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1675
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1675/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1675
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1675/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1675
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1675/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1675
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1675/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1675
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1675/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1675/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-messaging-framework-ci/87/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Tiago Salem Herrmann (tiagosh) wrote on 2016-10-14:

#

there was only one bug leading to a crash when using broadcast chats, but it is now fixed.
thanks.

review: Approve

Revision history for this message

system-apps-ci-bot (system-apps-ci-bot) on 2016-10-14:

#

review: Approve (continuous-integration)

messaging-framework

Merge lp://qastaging/~phablet-team/messaging-framework/last-minute-fixes into lp://qastaging/messaging-framework

Commit message

Description of the change

Preview Diff

Subscribers