Merge lp://qastaging/~xavi-garcia-mena/keeper/sf-error-handling-cleanup-checking-state into lp://qastaging/keeper
Proposed by
Xavi Garcia
| Status: | Merged |
|---|---|
| Approved by: | Charles Kerr |
| Approved revision: | 90 |
| Merged at revision: | 90 |
| Proposed branch: | lp://qastaging/~xavi-garcia-mena/keeper/sf-error-handling-cleanup-checking-state |
| Merge into: | lp://qastaging/keeper |
| Diff against target: |
189 lines (+26/-67) 6 files modified
src/service/keeper.cpp (+9/-1) src/storage-framework/storage_framework_client.cpp (+3/-27) src/storage-framework/storage_framework_client.h (+0/-4) tests/integration/helpers/helpers-test-failure.cpp (+14/-0) tests/integration/helpers/test-helpers-base.cpp (+0/-31) tests/integration/helpers/test-helpers-base.h (+0/-4) |
| To merge this branch: | bzr merge lp://qastaging/~xavi-garcia-mena/keeper/sf-error-handling-cleanup-checking-state |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Charles Kerr (community) | Approve | ||
|
Review via email:
|
|||
Commit message
change storage-framework error handling.
Description of the change
change storage-framework error handling.
The first throw, when we ask for the socket is because we don't want to block the dbus call.
The second is so we can change the state of the task to failed, as the file could not be created in sf, although all data was successfully sent by the helper.
It also adds some state checks in the failure test.
To post a comment you must log in.
Revision history for this message
| Charles Kerr (charlesk) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
