Merge lp://staging/~charlesk/keeper/connection-helper into lp://staging/keeper/devel
| Status: | Merged |
|---|---|
| Merged at revision: | 102 |
| Proposed branch: | lp://staging/~charlesk/keeper/connection-helper |
| Merge into: | lp://staging/keeper/devel |
| Diff against target: |
2093 lines (+676/-498) 48 files modified
include/client/client.h (+1/-1) include/helper/backup-helper.h (+5/-8) include/helper/helper.h (+1/-2) include/helper/metadata.h (+1/-2) src/cli/CMakeLists.txt (+3/-0) src/helper/CMakeLists.txt (+2/-0) src/helper/backup-helper.cpp (+78/-66) src/helper/helper.cpp (+5/-7) src/helper/metadata.cpp (+1/-5) src/service/CMakeLists.txt (+2/-2) src/service/app-const.h (+0/-3) src/service/backup-choices.cpp (+1/-1) src/service/backup-choices.h (+1/-1) src/service/keeper-task-backup.cpp (+30/-104) src/service/keeper-task-backup.h (+3/-3) src/service/keeper-task.cpp (+18/-14) src/service/keeper-task.h (+3/-5) src/service/keeper-user.h (+1/-1) src/service/keeper.cpp (+16/-47) src/service/metadata-provider.h (+1/-1) src/service/private/keeper-task_p.h (+2/-2) src/service/restore-choices.cpp (+1/-1) src/service/restore-choices.h (+1/-1) src/service/task-manager.cpp (+27/-38) src/service/task-manager.h (+3/-3) src/storage-framework/CMakeLists.txt (+3/-1) src/storage-framework/sf-uploader.cpp (+55/-0) src/storage-framework/sf-uploader.h (+45/-0) src/storage-framework/storage_framework_client.cpp (+107/-112) src/storage-framework/storage_framework_client.h (+25/-28) src/storage-framework/uploader.h (+44/-0) src/tar/tar-creator.cpp (+1/-1) src/tar/tar-creator.h (+1/-1) src/util/CMakeLists.txt (+28/-9) src/util/connection-helper.h (+120/-0) tests/dbusmock/CMakeLists.txt (+12/-13) tests/fakes/upstart/upstart-job-mock.cpp (+8/-0) tests/integration/CMakeLists.txt (+3/-1) tests/integration/helpers/CMakeLists.txt (+4/-2) tests/integration/helpers/helpers-test-failure.cpp (+1/-1) tests/integration/helpers/helpers-test.cc (+2/-2) tests/integration/helpers/test-helpers-base.cpp (+1/-1) tests/integration/helpers/test-helpers-base.h (+1/-1) tests/unit/CMakeLists.txt (+3/-1) tests/unit/helper/fake-helper.h (+0/-1) tests/unit/tar/tar-creator-libarchive-failure-test.cpp (+3/-3) tests/utils/file-utils.cpp (+1/-1) tests/utils/file-utils.h (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~charlesk/keeper/connection-helper |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| unity-api-1-bot | continuous-integration | Needs Fixing | |
| Xavi Garcia (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Add ConnectionHelper class to safely manage QFutures and signals
Description of the change
* Add ConnectionHelper, a class to manage connections to QFutures and one-shot signals. It will disconnect & release resources when the QFuture is finished or when the single-shot signal is called. Destroying the ConnectionHelper also disconnects & releases resources, so an object that needs to safely manage those kinds of connections can aggregate a ConnectionHelper so that connections are destroyed when the object is destroyed.
* Reimplement StorageFramewor
* move Uploader::commit() (previously StorageFramewor
Other:
* fix our QObject shared pointers such that their deleters call deleteLater()
* fix minor TestHelpers:
* fix broken email addresses
| unity-api-1-bot (unity-api-1-bot) wrote | # |
| unity-api-1-bot (unity-api-1-bot) wrote | # |
| unity-api-1-bot (unity-api-1-bot) wrote | # |
| unity-api-1-bot (unity-api-1-bot) wrote | # |
| unity-api-1-bot (unity-api-1-bot) wrote | # |
| unity-api-1-bot (unity-api-1-bot) wrote | # |
| unity-api-1-bot (unity-api-1-bot) wrote | # |
| unity-api-1-bot (unity-api-1-bot) wrote | # |
| unity-api-1-bot (unity-api-1-bot) wrote | # |
FAILED: Continuous integration, rev:118
https:/
Executed test runs:
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/