mcloud

Merge lp://staging/~gary-wzl77/mcloud/schedule_jobs into lp://staging/mcloud/devel

schedule_jobs
Merge into devel

Proposed by Gary.Wang on 2016-09-18

Status:	Merged
Approved by:	Zhang Enwei on 2016-09-27
Approved revision:	43
Merged at revision:	15
Proposed branch:	lp://staging/~gary-wzl77/mcloud/schedule_jobs
Merge into:	lp://staging/mcloud/devel
Diff against target:	10131 lines (+5649/-2397) 122 files modified .bzr-builddeb/default.conf (+2/-0) .bzrignore (+2/-0) CMakeLists.txt (+18/-3) debian/VERSION (+1/-0) debian/VERSION.vivid (+1/-0) debian/bileto_pre_release_hook (+24/-0) debian/changelog (+1/-1) debian/control (+16/-3) debian/control.in (+69/-0) debian/libmcloud1.install (+3/-0) debian/rules (+18/-0) include/mcloud/api/client.h (+61/-61) include/mcloud/api/cloudcontent.h (+2/-7) include/mcloud/api/cloudfolder.h (+7/-9) include/mcloud/api/cloudresource.h (+2/-4) include/mcloud/api/diskinfo.h (+1/-2) include/mcloud/api/downloadtask.h (+20/-39) include/mcloud/api/exceptions.h (+82/-0) include/mcloud/api/outlink.h (+1/-1) include/mcloud/api/syncmanager.h (+34/-37) include/mcloud/api/task.h (+12/-15) include/mcloud/api/uploadtask.h (+25/-50) provider/CMakeLists.txt (+16/-3) provider/McloudProvider.cpp (+666/-0) provider/McloudProvider.h (+82/-0) provider/com.canonical.StorageFramework.Provider.McloudProvider.service (+3/-0) provider/main.cpp (+20/-0) provider/mcloud-provider.cpp (+0/-666) src/CMakeLists.txt (+6/-2) src/mcloud/api/client.cpp (+29/-33) src/mcloud/api/client_priv.cpp (+141/-109) src/mcloud/api/client_priv.h (+27/-18) src/mcloud/api/cloudcontent.cpp (+13/-10) src/mcloud/api/cloudfolder.cpp (+19/-19) src/mcloud/api/diskinfo.cpp (+3/-3) src/mcloud/api/downloadtask.cpp (+37/-202) src/mcloud/api/downloadtask_priv.cpp (+214/-0) src/mcloud/api/downloadtask_priv.h (+96/-0) src/mcloud/api/outlink.cpp (+3/-3) src/mcloud/api/syncmanager.cpp (+26/-172) src/mcloud/api/syncmanager_priv.cpp (+104/-0) src/mcloud/api/syncmanager_priv.h (+72/-0) src/mcloud/api/syncthread.cpp (+48/-52) src/mcloud/api/syncthread.h (+1/-3) src/mcloud/api/taskhandler.h (+2/-1) src/mcloud/api/uploadtask.cpp (+34/-256) src/mcloud/api/uploadtask_priv.cpp (+236/-0) src/mcloud/api/uploadtask_priv.h (+117/-0) tests/CMakeLists.txt (+3/-6) tests/server/diskinfo/diskinfo.xml (+0/-1) tests/server/diskinfo/request_diskinfo.xml (+0/-3) tests/server/resources/1811asktx23a00019700101000000001.xml (+1/-0) tests/server/resources/1811asktx23a00019700101000000001_index_101.xml (+8/-0) tests/server/resources/1811asktx23a00019700101000000001_index_51.xml (+1/-0) tests/server/resources/1811asktx23a05520160718170034xh1.xml (+1/-0) tests/server/resources/1811asktx23a05720160531141118i3v.xml (+0/-1) tests/server/resources/content_1011YfnDD09x03920151110171910rox.xml (+0/-1) tests/server/resources/content_1811asktx23a05520160718170034xh1.xml (+1/-0) tests/server/resources/content_1811asktx23a05620160907094111z8s.xml (+1/-0) tests/server/resources/content_1811asktx23a05720160531141118i3v.xml (+1/-0) tests/server/resources/content_info_template.xml (+1/-0) tests/server/resources/copy_1811asktx23a05520160525143306t2l.xml (+1/-0) tests/server/resources/copy_1811asktx23a057201605161542182ws.xml (+1/-0) tests/server/resources/copy_content.xml (+0/-1) tests/server/resources/copy_folder.xml (+0/-1) tests/server/resources/copy_folder_template.xml (+1/-0) tests/server/resources/copy_multiple_content.xml (+1/-0) tests/server/resources/copy_multiple_folder.xml (+1/-0) tests/server/resources/copy_template.xml (+1/-0) tests/server/resources/create_folder_template.xml (+1/-0) tests/server/resources/delete_result.xml (+1/-0) tests/server/resources/diskinfo.xml (+1/-0) tests/server/resources/download-file-request-template.xml (+1/-0) tests/server/resources/illegal_content_name.xml (+1/-0) tests/server/resources/invalid_content_id.xml (+1/-0) tests/server/resources/invalid_folder_id.xml (+1/-0) tests/server/resources/invalid_token.xml (+1/-0) tests/server/resources/move_1811asktx23a05520160525143306t2l.xml (+11/-0) tests/server/resources/move_1811asktx23a057201605161541402vd.xml (+11/-0) tests/server/resources/move_content.xml (+0/-1) tests/server/resources/move_content_multiple.xml (+1/-0) tests/server/resources/move_content_template.xml (+11/-0) tests/server/resources/move_folder.xml (+0/-1) tests/server/resources/move_folder_multiple.xml (+1/-0) tests/server/resources/move_folder_template.xml (+11/-0) tests/server/resources/my_song.mp3.xml (+1/-1) tests/server/resources/no_such_folder_id.xml (+1/-0) tests/server/resources/request_diskinfo.xml (+3/-0) tests/server/resources/rm_generate_files.sh (+3/-0) tests/server/resources/root.xml (+1/-1) tests/server/resources/sprint_file.xml (+1/-0) tests/server/resources/upload-file-request-template.xml (+1/-0) tests/server/server.py (+283/-108) tests/unit/CMakeLists.txt (+9/-27) tests/unit/mcloud-provider/CMakeLists.txt (+57/-0) tests/unit/mcloud-provider/data/provider.xml (+263/-0) tests/unit/mcloud-provider/mcloud-provider-unit-tests.cpp (+671/-0) tests/unit/mcloud-provider/storage-framework-internal/CMakeLists.txt (+10/-0) tests/unit/mcloud-provider/storage-framework-internal/include/unity/storage/common.h (+41/-0) tests/unit/mcloud-provider/storage-framework-internal/include/unity/storage/internal/ItemMetadata.h (+51/-0) tests/unit/mcloud-provider/storage-framework-internal/include/unity/storage/internal/TraceMessageHandler.h (+47/-0) tests/unit/mcloud-provider/storage-framework-internal/include/unity/storage/internal/dbus_error.h (+32/-0) tests/unit/mcloud-provider/storage-framework-internal/include/unity/storage/internal/dbusmarshal.h (+45/-0) tests/unit/mcloud-provider/storage-framework-internal/include/unity/storage/internal/safe_strerror.h (+34/-0) tests/unit/mcloud-provider/storage-framework-internal/include/unity/storage/visibility.h (+22/-0) tests/unit/mcloud-provider/storage-framework-internal/src/CMakeLists.txt (+1/-0) tests/unit/mcloud-provider/storage-framework-internal/src/internal/CMakeLists.txt (+10/-0) tests/unit/mcloud-provider/storage-framework-internal/src/internal/TraceMessageHandler.cpp (+96/-0) tests/unit/mcloud-provider/storage-framework-internal/src/internal/dbusmarshal.cpp (+113/-0) tests/unit/mcloud-provider/storage-framework-internal/src/internal/safe_strerror.cpp (+72/-0) tests/unit/mcloud-provider/testsetup.h.in (+4/-0) tests/unit/mcloud-provider/utils/CMakeLists.txt (+29/-0) tests/unit/mcloud-provider/utils/DBusEnvironment.cpp (+84/-0) tests/unit/mcloud-provider/utils/DBusEnvironment.h (+49/-0) tests/unit/mcloud-provider/utils/ProviderFixture.cpp (+81/-0) tests/unit/mcloud-provider/utils/ProviderFixture.h (+50/-0) tests/unit/mcloud-provider/utils/com.ubuntu.OnlineAccounts.Manager.xml (+153/-0) tests/unit/mcloud-provider/utils/fake-online-accounts-daemon.py (+169/-0) tests/unit/mcloud/CMakeLists.txt (+31/-0) tests/unit/mcloud/api/mcloud-rest-test.cpp (+271/-0) tests/unit/mcloud/api/mcloud-sync-test.cpp (+365/-0) tests/unit/mcloud/api/test-mcloud-api.cpp (+0/-460)
To merge this branch:	bzr merge lp://staging/~gary-wzl77/mcloud/schedule_jobs
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Zhang Enwei (community)		2016-09-18	Approve on 2016-09-27
unity-api-1-bot	continuous-integration		Approve on 2016-09-26
Review via email: mp+306040@code.staging.launchpad.net

Commit message

support dual landing.

Description of the change

support dual landing.

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2016-09-19:

FAILED: Continuous integration, rev:39
https://jenkins.canonical.com/unity-api-1/job/lp-mcloud-ci/12/
Executed test runs:
FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/682/console
FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/688/console

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

review: Needs Fixing (continuous-integration)

lp://staging/~gary-wzl77/mcloud/schedule_jobs updated on 2016-09-20

40. By Gary.Wang on 2016-09-20: 1.minor change on provider/CMakeLists.txt for provider installation.
2.split mode for bzr-builddeb.

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2016-09-20:

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

review: Needs Fixing (continuous-integration)

lp://staging/~gary-wzl77/mcloud/schedule_jobs updated on 2016-09-20

41. By Gary.Wang on 2016-09-20: user EXPECT_TRUE and EXPECT_FALSE instead of EXPECT_EQ to avoid tests failed on vivid+overlay.

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2016-09-20:

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

review: Approve (continuous-integration)

lp://staging/~gary-wzl77/mcloud/schedule_jobs updated on 2016-09-22

42. By Gary.Wang on 2016-09-21: 1.fixes some typos.
2.adjust the number of clients(5->3) in provider. That fits better with bandwidth on touch when downloading content simultaneously.

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2016-09-22:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2016-09-22:

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

review: Approve (continuous-integration)

lp://staging/~gary-wzl77/mcloud/schedule_jobs updated on 2016-09-26

43. By Gary.Wang on 2016-09-26: 1.split mcloud unit test into two unit test(restful and syncup).
2.remove buffer_callback method for taskhandler.
3.some test cases fine-tuned for code coverage.
4.add timeout and credentail failed test cases.

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2016-09-26:

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

review: Approve (continuous-integration)

Revision history for this message

Zhang Enwei (zhangew401) wrote on 2016-09-27:

LGTM

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

to all changes:

Gary.Wang