sync-monitor

Merge lp://qastaging/~renatofilho/sync-monitor/start-after-unity8 into lp://qastaging/sync-monitor

  1. start-after-unity8
  2. Merge into trunk
Proposed by Renato Araujo Oliveira Filho
Status: Superseded
Proposed branch: lp://qastaging/~renatofilho/sync-monitor/start-after-unity8
Merge into: lp://qastaging/sync-monitor
Diff against target: 967 lines (+338/-103)
20 files modified
CMakeLists.txt (+2/-2)
Ubuntu/SyncMonitor/syncmonitor-qml.cpp (+2/-0)
data/CMakeLists.txt (+0/-8)
data/com.canonical.SyncMonitor.service.in (+0/-3)
debian/sync-monitor.install (+0/-1)
src/CMakeLists.txt (+4/-2)
src/eds-helper.cpp (+40/-39)
src/eds-helper.h (+1/-1)
src/sync-account.cpp (+5/-0)
src/sync-daemon.cpp (+104/-23)
src/sync-daemon.h (+10/-0)
src/sync-dbus.cpp (+28/-3)
src/sync-dbus.h (+7/-0)
src/sync-network.cpp (+51/-0)
src/sync-network.h (+48/-0)
src/sync-queue.cpp (+29/-4)
src/sync-queue.h (+4/-0)
tests/unittest/eds-helper-mock.h (+3/-1)
upstart/CMakeLists.txt (+0/-7)
upstart/sync-monitor.conf.in (+0/-9)
To merge this branch: bzr merge lp://qastaging/~renatofilho/sync-monitor/start-after-unity8
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ubuntu Phablet Team Pending
Review via email: mp+239207@code.qastaging.launchpad.net

This proposal has been superseded by a proposal from 2014-10-31.

Commit message

Do not start sync monitor with upstart.
The sync monitor will be started by the dbus service only when requested by apps.

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

PASSED: Continuous integration, rev:38
http://jenkins.qa.ubuntu.com/job/sync-monitor-ci/70/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-amd64-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-armhf-ci/18
        deb: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-armhf-ci/18/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-i386-ci/18

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/sync-monitor-ci/70/rebuild

review: Approve (continuous-integration)
lp://qastaging/~renatofilho/sync-monitor/start-after-unity8 updated
39. By Renato Araujo Oliveira Filho

Do not start sync monitor with upstart.
The sync monitor will be started by the dbus service only when requested.

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

PASSED: Continuous integration, rev:39
http://jenkins.qa.ubuntu.com/job/sync-monitor-ci/77/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-armhf-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-armhf-ci/25/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-i386-ci/25

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/sync-monitor-ci/77/rebuild

review: Approve (continuous-integration)
lp://qastaging/~renatofilho/sync-monitor/start-after-unity8 updated
40. By Renato Araujo Oliveira Filho

Only notify EDS changes to sync deamon after the first client connection.

41. By Renato Araujo Oliveira Filho

Removed dbus service.

Use only upstart service.

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

FAILED: Continuous integration, rev:41
http://jenkins.qa.ubuntu.com/job/sync-monitor-ci/80/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-amd64-ci/28/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-armhf-ci/28/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-i386-ci/28/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/sync-monitor-ci/80/rebuild

review: Needs Fixing (continuous-integration)
lp://qastaging/~renatofilho/sync-monitor/start-after-unity8 updated
42. By Renato Araujo Oliveira Filho

Renamed "detach" funcion.

43. By Renato Araujo Oliveira Filho

Revert upstart changes.

44. By Renato Araujo Oliveira Filho

Fixed install file.

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

FAILED: Continuous integration, rev:44
http://jenkins.qa.ubuntu.com/job/sync-monitor-ci/81/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-amd64-ci/29/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-armhf-ci/29/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-i386-ci/29/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/sync-monitor-ci/81/rebuild

review: Needs Fixing (continuous-integration)
lp://qastaging/~renatofilho/sync-monitor/start-after-unity8 updated
45. By Renato Araujo Oliveira Filho

Fixed unittest.

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

PASSED: Continuous integration, rev:45
http://jenkins.qa.ubuntu.com/job/sync-monitor-ci/82/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-amd64-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-armhf-ci/30
        deb: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-armhf-ci/30/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-i386-ci/30

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/sync-monitor-ci/82/rebuild

review: Approve (continuous-integration)
lp://qastaging/~renatofilho/sync-monitor/start-after-unity8 updated
46. By Renato Araujo Oliveira Filho

Merged lp:~renatofilho/sync-monitor/check-network

47. By Renato Araujo Oliveira Filho

Merged parent branch.

Unmerged revisions

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