Storage Framework

Merge lp:~michihenning/storage-framework/more-logging into lp:storage-framework/devel

  1. more-logging
  2. Merge into devel
Proposed by Michi Henning
Status: Merged
Approved by: Michi Henning
Approved revision: 78
Merged at revision: 78
Proposed branch: lp:~michihenning/storage-framework/more-logging
Merge into: lp:storage-framework/devel
Diff against target: 48 lines (+9/-4)
2 files modified
src/qt/internal/ItemImpl.cpp (+7/-3)
tests/remote-client/remote-client_test.cpp (+2/-1)
To merge this branch: bzr merge lp:~michihenning/storage-framework/more-logging
Reviewer Review Type Date Requested Status
unity-api-1-bot continuous-integration Approve
Unity API Team Pending
Review via email: mp+308082@code.launchpad.net

Commit message

Log more provider errors.

Description of the change

Log more provider errors.

To post a comment you must log in.
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:78
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/146/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/856
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/863
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/670
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/670/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/670
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/670/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/670
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/670/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/670
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/670/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/670
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/670/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/670
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/670/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/670
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/670/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/670
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/670/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/670
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/670/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/qt/internal/ItemImpl.cpp'
2--- src/qt/internal/ItemImpl.cpp 2016-10-10 04:07:07 +0000
3+++ src/qt/internal/ItemImpl.cpp 2016-10-10 23:33:08 +0000
4@@ -199,7 +199,7 @@
5 ||
6 (md_.type != ItemType::file && md.type == ItemType::file))
7 {
8- QString msg = method + ": source and target item type differ";
9+ QString msg = method + ": provider error: source and target item type differ";
10 qCritical().noquote() << msg;
11 throw StorageErrorImpl::local_comms_error(msg);
12 }
13@@ -259,7 +259,9 @@
14 {
15 if (md.type == storage::ItemType::root)
16 {
17- throw StorageErrorImpl::local_comms_error(method + ": impossible root item returned by provider");
18+ QString msg = method + ": impossible root item returned by provider";
19+ qCritical().noquote() << msg;
20+ throw StorageErrorImpl::local_comms_error(msg);
21 }
22 };
23
24@@ -318,7 +320,9 @@
25 {
26 return;
27 }
28- throw StorageErrorImpl::local_comms_error(method + ": impossible file item returned by provider");
29+ QString msg = method + ": impossible file item returned by provider";
30+ qCritical().noquote() << msg;
31+ throw StorageErrorImpl::local_comms_error(msg);
32 };
33
34 auto reply = account_->provider()->CreateFolder(md_.item_id, name);
35
36=== modified file 'tests/remote-client/remote-client_test.cpp'
37--- tests/remote-client/remote-client_test.cpp 2016-10-10 04:07:07 +0000
38+++ tests/remote-client/remote-client_test.cpp 2016-10-10 23:33:08 +0000
39@@ -1751,7 +1751,8 @@
40 EXPECT_FALSE(j->isValid());
41 EXPECT_EQ(ItemJob::Status::Error, j->status());
42 EXPECT_EQ(StorageError::Type::LocalCommsError, j->error().type());
43- EXPECT_EQ("LocalCommsError: Item::move(): source and target item type differ", j->error().errorString());
44+ EXPECT_EQ("LocalCommsError: Item::move(): provider error: source and target item type differ",
45+ j->error().errorString());
46 }
47
48 TEST_F(LookupTest, basic)

Subscribers

People subscribed via source and target branches

to all changes: