lp://qastaging/~charlesk/keeper/handle-tar-creator-edge-cases
Created by
Charles Kerr
and last modified
- Get this branch:
- bzr branch lp://qastaging/~charlesk/keeper/handle-tar-creator-edge-cases
Only
Charles Kerr
can upload to this branch. If you are
Charles Kerr
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
On hold
for merging
into
lp://qastaging/keeper/devel
- unity-api-1-bot: Needs Fixing (continuous-integration)
- Xavi Garcia: Pending requested
-
Diff: 484 lines (+233/-116)2 files modifiedsrc/tar/tar-creator.cpp (+131/-77)
tests/unit/tar/tar-creator-test.cpp (+102/-39)
Superseded
for merging
into
lp://qastaging/keeper
- Xavi Garcia: Pending requested
-
Diff: 7720 lines (+3998/-1884)89 files modifiedCMakeLists.txt (+18/-3)
debian/changelog (+1/-1)
debian/control (+10/-0)
debian/qml-keeper.install (+1/-0)
debian/rules (+1/-0)
include/client/client.h (+37/-9)
include/helper/backup-helper.h (+11/-7)
include/helper/helper.h (+21/-7)
include/helper/metadata.h (+1/-1)
src/cli/CMakeLists.txt (+3/-0)
src/cli/main.cpp (+1/-2)
src/client/CMakeLists.txt (+5/-14)
src/client/client.cpp (+180/-28)
src/client/qml-plugin/CMakeLists.txt (+42/-0)
src/client/qml-plugin/plugin.cpp (+37/-0)
src/client/qml-plugin/plugin.h (+33/-0)
src/client/qml-plugin/qmldir (+2/-0)
src/helper/CMakeLists.txt (+2/-0)
src/helper/backup-helper.cpp (+144/-161)
src/helper/helper.cpp (+199/-19)
src/helper/metadata.cpp (+1/-1)
src/service/CMakeLists.txt (+31/-6)
src/service/app-const.h (+0/-3)
src/service/backup-choices.cpp (+2/-2)
src/service/backup-choices.h (+2/-2)
src/service/keeper-task-backup.cpp (+105/-0)
src/service/keeper-task-backup.h (+46/-0)
src/service/keeper-task.cpp (+203/-0)
src/service/keeper-task.h (+70/-0)
src/service/keeper-user.cpp (+11/-4)
src/service/keeper-user.h (+1/-1)
src/service/keeper.cpp (+72/-331)
src/service/keeper.h (+6/-3)
src/service/metadata-provider.h (+2/-2)
src/service/private/keeper-task_p.h (+56/-0)
src/service/restore-choices.cpp (+8/-3)
src/service/restore-choices.h (+2/-2)
src/service/task-manager.cpp (+323/-0)
src/service/task-manager.h (+67/-0)
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 (+114/-90)
src/storage-framework/storage_framework_client.h (+26/-25)
src/storage-framework/uploader.h (+44/-0)
src/tar/tar-creator.cpp (+97/-40)
src/tar/tar-creator.h (+1/-1)
src/util/CMakeLists.txt (+28/-9)
src/util/attributes.h (+26/-0)
src/util/connection-helper.h (+120/-0)
src/util/dbus-utils.cpp (+6/-1)
src/util/unix-signal-handler.cpp (+4/-4)
tests/CMakeLists.txt (+28/-1)
tests/dbusmock/CMakeLists.txt (+12/-13)
tests/fakes/CMakeLists.txt (+3/-0)
tests/fakes/fake-backup-helper.cpp (+5/-4)
tests/fakes/inactive_helper.sh (+22/-0)
tests/fakes/upstart/CMakeLists.txt (+68/-0)
tests/fakes/upstart/com.ubuntu.Upstart0_6.Instance.xml (+7/-0)
tests/fakes/upstart/com.ubuntu.Upstart0_6.Job.xml (+19/-0)
tests/fakes/upstart/com.ubuntu.Upstart0_6.xml (+18/-0)
tests/fakes/upstart/main.cpp (+83/-0)
tests/fakes/upstart/upstart-defs.h (+35/-0)
tests/fakes/upstart/upstart-instance-mock.cpp (+37/-0)
tests/fakes/upstart/upstart-instance-mock.h (+47/-0)
tests/fakes/upstart/upstart-job-mock.cpp (+187/-0)
tests/fakes/upstart/upstart-job-mock.h (+56/-0)
tests/fakes/upstart/upstart-mock.cpp (+50/-0)
tests/fakes/upstart/upstart-mock.h (+46/-0)
tests/integration/CMakeLists.txt (+3/-1)
tests/integration/helpers/CMakeLists.txt (+9/-5)
tests/integration/helpers/helpers-test-failure.cpp (+34/-20)
tests/integration/helpers/helpers-test.cc (+91/-228)
tests/integration/helpers/mir-mock.cpp (+0/-124)
tests/integration/helpers/mir-mock.h (+0/-31)
tests/integration/helpers/test-helpers-base.cpp (+508/-431)
tests/integration/helpers/test-helpers-base.h (+47/-66)
tests/qdbus-stubs/CMakeLists.txt (+53/-0)
tests/qdbus-stubs/org.freedesktop.DBus.Properties.xml (+27/-0)
tests/unit/CMakeLists.txt (+3/-1)
tests/unit/helper/CMakeLists.txt (+4/-4)
tests/unit/helper/fake-helper.h (+1/-1)
tests/unit/helper/speed-test.cpp (+9/-2)
tests/unit/tar/keeper-tar-create-test.cpp (+0/-1)
tests/unit/tar/tar-creator-libarchive-failure-test.cpp (+15/-13)
tests/unit/tar/tar-creator-test.cpp (+1/-2)
tests/utils/file-utils.cpp (+139/-137)
tests/utils/file-utils.h (+3/-14)
tests/utils/keeper-dbusmock-fixture.h (+2/-2)
Branch information
Recent revisions
- 122. By Charles Kerr
-
since the tar-creator-test failure is only happening in compress, try reimplementing the read loop in calculate_
compressed_ size() - 121. By Charles Kerr
-
in tar-creator-test, split the compressed and uncompressed tests out into separate pieces
- 118. By Charles Kerr
-
in tar-creator's append_
bytes_write_ cb(), don't use references for storing the result of static_cast calls
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://qastaging/keeper