mcloud

Merge lp://staging/~gary-wzl77/mcloud/storage-framework-v2 into lp://staging/mcloud/devel

storage-framework-v2
Merge into devel

Proposed by Gary.Wang on 2016-11-18

Status:

Needs review

Proposed branch:

lp://staging/~gary-wzl77/mcloud/storage-framework-v2

Merge into:

lp://staging/mcloud/devel

Diff against target:

8532 lines (+2397/-2967)

87 files modified

data/mcloud.pc.in (+1/-1)
debian/changelog (+12/-2)
debian/control (+8/-6)
debian/control.in (+10/-7)
debian/libmcloud1.install (+3/-0)
debian/libmcloud2.install (+4/-1)
debian/rules (+2/-0)
doc/Doxyfile.in (+1/-1)
include/mcloud/api/client.h (+56/-51)
include/mcloud/api/cloudcontent.h (+55/-53)
include/mcloud/api/cloudfolder.h (+31/-31)
include/mcloud/api/cloudresource.h (+13/-13)
include/mcloud/api/diskinfo.h (+2/-2)
include/mcloud/api/downloadtask.h (+30/-17)
include/mcloud/api/exceptions.h (+49/-49)
include/mcloud/api/outlink.h (+4/-4)
include/mcloud/api/syncmanager.h (+32/-39)
include/mcloud/api/task.h (+10/-10)
include/mcloud/api/taskqueue.h (+8/-8)
include/mcloud/api/uploadtask.h (+19/-15)
provider/CMakeLists.txt (+24/-5)
provider/com.canonical.StorageFramework.Provider.Mcloud.service.in (+3/-0)
provider/com.canonical.StorageFramework.Provider.McloudProvider.service (+0/-3)
provider/main.cpp (+7/-2)
provider/mcloudprovider.cpp (+143/-83)
provider/mcloudprovider.h (+34/-35)
provider/storage-provider-mcloud.application (+11/-0)
provider/storage-provider-mcloud.desktop (+5/-0)
provider/storage-provider-mcloud.service (+7/-0)
src/mcloud/api/client.cpp (+26/-26)
src/mcloud/api/client_priv.cpp (+182/-215)
src/mcloud/api/client_priv.h (+63/-65)
src/mcloud/api/cloudcontent.cpp (+15/-15)
src/mcloud/api/cloudfolder.cpp (+11/-11)
src/mcloud/api/diskinfo.cpp (+3/-3)
src/mcloud/api/downloadtask.cpp (+11/-11)
src/mcloud/api/downloadtask_priv.cpp (+17/-18)
src/mcloud/api/downloadtask_priv.h (+20/-20)
src/mcloud/api/outlink.cpp (+4/-4)
src/mcloud/api/syncmanager.cpp (+7/-13)
src/mcloud/api/syncmanager_priv.cpp (+13/-23)
src/mcloud/api/syncmanager_priv.h (+7/-9)
src/mcloud/api/syncthread.cpp (+18/-19)
src/mcloud/api/taskhandler.h (+15/-15)
src/mcloud/api/uploadtask.cpp (+11/-11)
src/mcloud/api/uploadtask_priv.cpp (+60/-57)
src/mcloud/api/uploadtask_priv.h (+27/-27)
tests/server/resources/1011YfnDD09x03920151110171910rox.xml (+1/-0)
tests/server/resources/1811asktx23a00019700101000000001.backup.xml (+1/-0)
tests/server/resources/1811asktx23a00019700101000000001.single.xml (+1/-0)
tests/server/resources/1811asktx23a00019700101000000001_index_101.xml (+93/-1)
tests/server/resources/1811asktx23a057201605161542175lg.xml (+1/-0)
tests/server/resources/1811asktx23a058201609111803007pu.xml (+1/-0)
tests/server/resources/content_1811asktx23a05520160718170034xh1.xml (+1/-1)
tests/server/resources/copy_1811asktx23a057201605161542175gg.xml (+1/-0)
tests/server/resources/download-file-request-template.xml (+1/-1)
tests/server/resources/no_such_content_id.xml (+1/-0)
tests/server/resources/no_such_folder_id.xml (+1/-1)
tests/server/server.py (+102/-56)
tests/unit/mcloud-provider/CMakeLists.txt (+5/-18)
tests/unit/mcloud-provider/data/provider.xml (+0/-263)
tests/unit/mcloud-provider/mcloud-provider-unit-test.cpp (+899/-0)
tests/unit/mcloud-provider/mcloud-provider-unit-tests.cpp (+0/-641)
tests/unit/mcloud-provider/storage-framework-internal/CMakeLists.txt (+0/-10)
tests/unit/mcloud-provider/storage-framework-internal/include/unity/storage/common.h (+0/-41)
tests/unit/mcloud-provider/storage-framework-internal/include/unity/storage/internal/ItemMetadata.h (+0/-51)
tests/unit/mcloud-provider/storage-framework-internal/include/unity/storage/internal/TraceMessageHandler.h (+0/-47)
tests/unit/mcloud-provider/storage-framework-internal/include/unity/storage/internal/dbus_error.h (+0/-32)
tests/unit/mcloud-provider/storage-framework-internal/include/unity/storage/internal/dbusmarshal.h (+0/-45)
tests/unit/mcloud-provider/storage-framework-internal/include/unity/storage/internal/safe_strerror.h (+0/-34)
tests/unit/mcloud-provider/storage-framework-internal/include/unity/storage/visibility.h (+0/-22)
tests/unit/mcloud-provider/storage-framework-internal/src/CMakeLists.txt (+0/-1)
tests/unit/mcloud-provider/storage-framework-internal/src/internal/CMakeLists.txt (+0/-10)
tests/unit/mcloud-provider/storage-framework-internal/src/internal/TraceMessageHandler.cpp (+0/-96)
tests/unit/mcloud-provider/storage-framework-internal/src/internal/dbusmarshal.cpp (+0/-113)
tests/unit/mcloud-provider/storage-framework-internal/src/internal/safe_strerror.cpp (+0/-72)
tests/unit/mcloud-provider/utils/CMakeLists.txt (+6/-24)
tests/unit/mcloud-provider/utils/DBusEnvironment.cpp (+0/-11)
tests/unit/mcloud-provider/utils/DBusEnvironment.h (+0/-1)
tests/unit/mcloud-provider/utils/ProviderEnvironment.cpp (+55/-0)
tests/unit/mcloud-provider/utils/ProviderEnvironment.h (+30/-0)
tests/unit/mcloud-provider/utils/ProviderFixture.cpp (+0/-81)
tests/unit/mcloud-provider/utils/ProviderFixture.h (+0/-50)
tests/unit/mcloud-provider/utils/com.ubuntu.OnlineAccounts.Manager.xml (+0/-153)
tests/unit/mcloud-provider/utils/fake-online-accounts-daemon.py (+6/-3)
tests/unit/mcloud/api/mcloud-rest-test.cpp (+45/-29)
tests/unit/mcloud/api/mcloud-sync-test.cpp (+52/-59)

To merge this branch:

bzr merge lp://staging/~gary-wzl77/mcloud/storage-framework-v2

Related bugs:

Bug #1638439: Adapt to new API changes of storage-framework	Medium	In Progress
Bug #1641541: mcloud-provider received signal SIGPIPE, Broken pipe.	Medium	In Progress

Link a bug report

Reviewer	Review Type	Date Requested	Status
unity-api-1-bot	continuous-integration		Approve on 2016-12-07
mcloud-team		2016-11-18	Pending
Review via email: mp+311231@code.staging.launchpad.net

Commit message

1. adapted to storage-fw client v2 API(Fixed: 1638439).
2. add missing dependency(account-plugin-mcloud)
3. generate job upload id with uuid.
4. use new service name to avoid conflict with mcloud-scope.
5. Ignore SIGPIPE in case of downloader is canceled when downloading(Fixed: 1641541).
6.bump version up due to ABI changed.

Description of the change

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2016-11-18:

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-mcloud-ci/29/rebuild

review: Approve (continuous-integration)

lp://staging/~gary-wzl77/mcloud/storage-framework-v2 updated on 2016-11-21

28. By Gary.Wang on 2016-11-21: 1. merge from devel
2. add storage quota test case for code coverage purpose.

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2016-11-21:

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-mcloud-ci/30/rebuild

review: Approve (continuous-integration)

lp://staging/~gary-wzl77/mcloud/storage-framework-v2 updated on 2016-12-07

29. By Gary.Wang on 2016-12-07: 1.fixed mcloud provider installation path and exec path in dbus service.
2.add prefix name(mcloud) for non-standard metadata.

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2016-12-07:

FAILED: Continuous integration, rev:29
https://jenkins.canonical.com/unity-api-1/job/lp-mcloud-ci/31/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1238/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1245
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1028/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1028/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1028/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1028/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1028/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1028/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-mcloud-ci/31/rebuild

review: Needs Fixing (continuous-integration)

lp://staging/~gary-wzl77/mcloud/storage-framework-v2 updated on 2016-12-07

30. By Gary.Wang on 2016-12-07: Fixed gtest sign-compare warning.

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2016-12-07:

PASSED: Continuous integration, rev:30
https://jenkins.canonical.com/unity-api-1/job/lp-mcloud-ci/32/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1239
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1246
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1029
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1029/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1029
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1029/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1029
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1029/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1029
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1029/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1029
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1029/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1029
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1029/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-mcloud-ci/32/rebuild

review: Approve (continuous-integration)

Unmerged revisions

30. By Gary.Wang on 2016-12-07: Fixed gtest sign-compare warning.
29. By Gary.Wang on 2016-12-07: 1.fixed mcloud provider installation path and exec path in dbus service.
2.add prefix name(mcloud) for non-standard metadata.
28. By Gary.Wang on 2016-11-21: 1. merge from devel
2. add storage quota test case for code coverage purpose.
27. By Gary.Wang on 2016-11-18: 1.update dbus type signature to fit for online-account-api ABI change.
2.libstorage-framework-qt-client-2-0 package is not added into depends of storage-framework-client-dev. add it into build-depends in onedrive debian/control file to avoid linking error.
26. By Gary.Wang on 2016-11-14: * adapted to storage-fw client v2 API(Fixed: 1638439).
* use new service name to avoid conflict with mcloud-scope.
* Ignore SIGPIPE in case of downloader is canceled when downlaoding(Fixed: 1641541).
25. By Gary.Wang on 2016-11-03: update onedrive account service id in fake daemon.
24. By Gary.Wang on 2016-11-03: update account service id.
23. By Gary.Wang on 2016-11-03: Add provider desktop, service as well as application file. Get rid of old service id.
22. By Gary.Wang on 2016-11-02: simplify the test cases.
21. By Gary.Wang on 2016-11-02: add more unit tests(delete, update, list_invalid).

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

to all changes:

Gary.Wang