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

[Michi Henning]

Improved coverage. Better error reporting/handling.

Very boring branch. Lots of extra tests for proper coverage, particularly for error handling/reporting.

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:71
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/39/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/260/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/268/console

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

review: Needs Fixing (continuous-integration)

[lp:~michihenning/storage-framework/more-coverage]

72. By Michi Henning on 2016-08-02

Removed dependency on boost from remote client for exception handling.
Refactored exception handling logic and fixed tests to look for the correct exception.

73. By Michi Henning on 2016-08-02

More refactoring for error handling.

74. By Michi Henning on 2016-08-02

More refactoring to get rid of repeated exception handlers.

75. By Michi Henning on 2016-08-02

Removed stale code, fixed spy usage in tests.

76. By Michi Henning on 2016-08-02

A few coverage suppressions.

77. By Michi Henning on 2016-08-03

Fixed hang in test. Fixed sigpipe problem when cancelling upload.

78. By Michi Henning on 2016-08-03

Added a few missing checks for destroyed runtime or item.

79. By Michi Henning on 2016-08-03

Fixed incorrect check for parent destruction in copy() and move().

80. By Michi Henning on 2016-08-03

Fix typos.

Unmerged revisions

=== modified file 'include/unity/storage/qt/client/Account.h'
--- include/unity/storage/qt/client/Account.h	2016-07-22 02:35:12 +0000
+++ include/unity/storage/qt/client/Account.h	2016-07-29 05:58:49 +0000
@@ -77,7 +77,7 @@
 
     typedef std::shared_ptr<Account> SPtr;
 
-    Runtime* runtime() const;
+    std::shared_ptr<Runtime> runtime() const;
 
     QString owner() const;
     QString owner_id() const;
 
=== modified file 'include/unity/storage/qt/client/Exceptions.h'
--- include/unity/storage/qt/client/Exceptions.h	2016-07-22 02:35:12 +0000
+++ include/unity/storage/qt/client/Exceptions.h	2016-07-29 05:58:49 +0000
@@ -46,6 +46,8 @@
 
     virtual char const* what() const noexcept override;
 
+    QString error_message() const;
+
 private:
     std::string what_string_;
     QString error_message_;
@@ -234,11 +236,16 @@
 class UNITY_STORAGE_EXPORT ResourceException : public StorageException
 {
 public:
-    ResourceException(QString const& error_message);
+    ResourceException(QString const& error_message, int error_code);
     ~ResourceException();
 
     virtual ResourceException* clone() const override;
     virtual void raise() const override;
+
+    int error_code() const noexcept;
+
+private:
+    int error_code_;
 };
 
 }  // namespace client
 
=== modified file 'include/unity/storage/qt/client/Item.h'
--- include/unity/storage/qt/client/Item.h	2016-07-22 02:45:24 +0000
+++ include/unity/storage/qt/client/Item.h	2016-07-29 05:58:49 +0000
@@ -103,7 +103,7 @@
 
     If this item is a root, the returned pointer points at this item.
     */
-    Root* root() const;
+    std::shared_ptr<Root> root() const;
 
     /**
     \brief Returns the type of the item.
 
=== modified file 'include/unity/storage/qt/client/Root.h'
--- include/unity/storage/qt/client/Root.h	2016-07-12 02:22:05 +0000
+++ include/unity/storage/qt/client/Root.h	2016-07-29 05:58:49 +0000
@@ -70,7 +70,7 @@
     /**
     \brief Returns the account for this root.
     */
-    Account* account() const;
+    std::shared_ptr<Account> account() const;
 
     QFuture<int64_t> free_space_bytes() const;
     QFuture<int64_t> used_space_bytes() const;
 
=== modified file 'include/unity/storage/qt/client/Runtime.h'
--- include/unity/storage/qt/client/Runtime.h	2016-07-22 02:35:12 +0000
+++ include/unity/storage/qt/client/Runtime.h	2016-07-29 05:58:49 +0000
@@ -44,6 +44,7 @@
 namespace internal
 {
 
+class AccountBase;
 class RuntimeBase;
 
 namespace remote_client
@@ -100,6 +101,7 @@
 
     std::shared_ptr<internal::RuntimeBase> p_;
 
+    friend class internal::AccountBase;
     friend class internal::remote_client::AccountImpl;
 };
 
 
=== modified file 'include/unity/storage/qt/client/internal/AccountBase.h'
--- include/unity/storage/qt/client/internal/AccountBase.h	2016-07-22 02:35:12 +0000
+++ include/unity/storage/qt/client/internal/AccountBase.h	2016-07-29 05:58:49 +0000
@@ -52,7 +52,7 @@
     AccountBase(AccountBase const&) = delete;
     AccountBase& operator=(AccountBase const&) = delete;
 
-    Runtime* runtime() const;
+    std::shared_ptr<Runtime> runtime() const;
     virtual QString owner() const = 0;
     virtual QString owner_id() const = 0;
     virtual QString description() const = 0;
 
=== modified file 'include/unity/storage/qt/client/internal/ItemBase.h'
--- include/unity/storage/qt/client/internal/ItemBase.h	2016-07-27 02:19:17 +0000
+++ include/unity/storage/qt/client/internal/ItemBase.h	2016-07-29 05:58:49 +0000
@@ -60,7 +60,7 @@
 
     QString native_identity() const;
     ItemType type() const;
-    Root* root() const;
+    std::shared_ptr<Root> root() const;
 
     virtual QString name() const = 0;
     virtual QString etag() const = 0;
@@ -82,6 +82,8 @@
     void set_public_instance(std::weak_ptr<Item> p);
 
 protected:
+    std::shared_ptr<Root> get_root() const noexcept;
+
     const QString identity_;
     const ItemType type_;
     std::weak_ptr<Root> root_;
 
=== modified file 'include/unity/storage/qt/client/internal/RootBase.h'
--- include/unity/storage/qt/client/internal/RootBase.h	2016-07-12 02:22:05 +0000
+++ include/unity/storage/qt/client/internal/RootBase.h	2016-07-29 05:58:49 +0000
@@ -46,7 +46,7 @@
 public:
     RootBase(QString const& identity, std::weak_ptr<Account> const& account);
 
-    Account* account() const;
+    std::shared_ptr<Account> account() const;
     virtual QFuture<int64_t> free_space_bytes() const = 0;
     virtual QFuture<int64_t> used_space_bytes() const = 0;
     virtual QFuture<Item::SPtr> get(QString native_identity) const = 0;
 
=== modified file 'include/unity/storage/qt/client/internal/RuntimeBase.h'
--- include/unity/storage/qt/client/internal/RuntimeBase.h	2016-07-22 02:35:12 +0000
+++ include/unity/storage/qt/client/internal/RuntimeBase.h	2016-07-29 05:58:49 +0000
@@ -25,7 +25,6 @@
 #pragma GCC diagnostic pop
 #include <QVector>
 
-#include <atomic>
 #include <memory>
 
 namespace unity
@@ -43,10 +42,12 @@
 namespace internal
 {
 
+class AccountBase;
+
 class RuntimeBase : public QObject
 {
 public:
-    RuntimeBase();
+    RuntimeBase() = default;
     virtual ~RuntimeBase() = default;
     RuntimeBase(RuntimeBase const&) = delete;
     RuntimeBase& operator=(RuntimeBase const&) = delete;
@@ -57,9 +58,11 @@
     void set_public_instance(std::weak_ptr<Runtime> p);
 
 protected:
-    std::atomic_bool destroyed_;
-    QVector<std::shared_ptr<Account>> accounts_;  // Immutable once set
+    bool destroyed_ = false;
+    QVector<std::shared_ptr<Account>> accounts_;
     std::weak_ptr<Runtime> public_instance_;      // Immutable once set
+
+    friend class unity::storage::qt::client::internal::AccountBase;
 };
 
 }  // namespace internal
 
=== modified file 'include/unity/storage/qt/client/internal/local_client/DownloaderImpl.h'
--- include/unity/storage/qt/client/internal/local_client/DownloaderImpl.h	2016-07-14 04:50:36 +0000
+++ include/unity/storage/qt/client/internal/local_client/DownloaderImpl.h	2016-07-29 05:58:49 +0000
@@ -60,7 +60,7 @@
 
 private:
     void read_and_write_chunk();
-    void handle_error(QString const& msg);
+    void handle_error(QString const& msg, int error_code);
 
     enum State { in_progress, finalized, cancelled, error };
 
@@ -73,6 +73,7 @@
     QFutureInterface<void>& worker_initialized_;
     qint64 bytes_to_write_;
     QString error_msg_;
+    int error_code_ = 0;
 };
 
 class DownloadThread : public QThread
 
=== modified file 'include/unity/storage/qt/client/internal/local_client/FolderImpl.h'
--- include/unity/storage/qt/client/internal/local_client/FolderImpl.h	2016-07-14 00:17:14 +0000
+++ include/unity/storage/qt/client/internal/local_client/FolderImpl.h	2016-07-29 05:58:49 +0000
@@ -40,6 +40,7 @@
     FolderImpl(QString const& identity);
     FolderImpl(QString const& identity, ItemType type);
 
+    virtual QString name() const override;
     QFuture<QVector<std::shared_ptr<Item>>> list() const override;
     QFuture<QVector<std::shared_ptr<Item>>> lookup(QString const& name) const override;
     QFuture<std::shared_ptr<Folder>> create_folder(QString const& name) override;
 
=== modified file 'include/unity/storage/qt/client/internal/local_client/ItemImpl.h'
--- include/unity/storage/qt/client/internal/local_client/ItemImpl.h	2016-07-27 02:19:17 +0000
+++ include/unity/storage/qt/client/internal/local_client/ItemImpl.h	2016-07-29 05:58:49 +0000
@@ -47,7 +47,6 @@
     ItemImpl(QString const& identity, ItemType type);
     virtual ~ItemImpl();
 
-    virtual QString name() const override;
     virtual QString etag() const override;
     virtual QVariantMap metadata() const override;
     virtual QDateTime last_modified_time() const override;
@@ -65,8 +64,6 @@
     void set_timestamps() noexcept;
     bool has_conflict() const noexcept;
 
-    std::unique_lock<std::mutex> get_lock();
-
 protected:
     static boost::filesystem::path sanitize(QString const& name, QString const& method);
     static bool is_reserved_path(boost::filesystem::path const& path) noexcept;
@@ -78,7 +75,10 @@
     QString etag_;
     QDateTime modified_time_;
     QVariantMap metadata_;
-    std::mutex mutable mutex_;
+    std::recursive_mutex mutable mutex_;
+
+private:
+    static void copy_recursively(boost::filesystem::path const& source, boost::filesystem::path const& target);
 };
 
 }  // namespace local_client
 
=== modified file 'include/unity/storage/qt/client/internal/local_client/UploaderImpl.h'
--- include/unity/storage/qt/client/internal/local_client/UploaderImpl.h	2016-07-26 01:51:26 +0000
+++ include/unity/storage/qt/client/internal/local_client/UploaderImpl.h	2016-07-29 05:58:49 +0000
@@ -68,12 +68,11 @@
 private Q_SLOTS:
     void on_bytes_ready();
     void on_read_channel_finished();
-    void on_error();
 
 private:
     void read_and_write_chunk();
     void finalize();
-    void handle_error(QString const& msg);
+    void handle_error(QString const& msg, int error_code);
 
     enum State { in_progress, finalized, cancelled, error };
 
@@ -91,6 +90,7 @@
     QFutureInterface<std::shared_ptr<File>>& qf_;
     QFutureInterface<void>& worker_initialized_;
     QString error_msg_;
+    int error_code_ = 0;
     bool use_linkat_ = true;
 };
 
 
=== modified file 'include/unity/storage/qt/client/internal/make_future.h'
--- include/unity/storage/qt/client/internal/make_future.h	2016-07-22 02:35:12 +0000
+++ include/unity/storage/qt/client/internal/make_future.h	2016-07-29 05:58:49 +0000
@@ -18,6 +18,9 @@
 
 #pragma once
 
+#include <unity/storage/qt/client/Exceptions.h>
+#include <unity/storage/qt/client/internal/boost_filesystem.h>
+
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #pragma GCC diagnostic ignored "-Wcast-align"
@@ -94,6 +97,62 @@
     return qf.future();
 }
 
+template<typename T>
+QFuture<T> make_exceptional_future(QString const& msg, boost::filesystem::filesystem_error const& e)
+{
+    QFutureInterface<T> qf;
+    switch (e.code().value())
+    {
+        case EACCES:
+        case EPERM:
+        {
+            qf.reportException(PermissionException(msg));
+            break;
+        }
+        case EDQUOT:
+        case ENOSPC:
+        {
+            qf.reportException(QuotaException(msg));
+            break;
+        }
+        case ENOENT:
+        {
+            //qf.reportException(NotExistsException(msg));
+            qDebug() << "ENOENT";
+            qf.reportException(ResourceException(msg, e.code().value()));
+            break;
+        }
+        default:
+        {
+            qf.reportException(ResourceException(msg, e.code().value()));
+            break;
+        }
+    }
+    qf.reportFinished();
+    return qf.future();
+}
+
+template<typename T>
+QFuture<T> make_exceptional_future(QString const& msg, boost::filesystem::filesystem_error const& e, QString const& key)
+{
+    QFutureInterface<T> qf;
+    switch (e.code().value())
+    {
+        case ENOENT:
+        {
+            qf.reportException(NotExistsException(msg, key));
+            break;
+        }
+        default:
+        {
+            return make_exceptional_future<T>(msg, e);
+            break;
+        }
+    }
+    qf.reportFinished();
+    return qf.future();
+}
+
 }  // namespace internal
 }  // namespace client
 }  // namespace qt
 
=== modified file 'include/unity/storage/qt/client/internal/remote_client/Handler.h'
--- include/unity/storage/qt/client/internal/remote_client/Handler.h	2016-07-15 03:58:35 +0000
+++ include/unity/storage/qt/client/internal/remote_client/Handler.h	2016-07-29 05:58:49 +0000
@@ -18,7 +18,6 @@
 
 #pragma once
 
-#include <unity/storage/qt/client/Exceptions.h>
 #include <unity/storage/qt/client/internal/make_future.h>
 #include <unity/storage/qt/client/internal/remote_client/HandlerBase.h>
 
@@ -72,8 +71,8 @@
                       {
                           if (call.isError())
                           {
-                              qDebug() << call.error().message();  // TODO, remove this
-                              make_exceptional_future<T>(ResourceException("DBus error return"));
+                              int err = call.error().type();
+                              make_exceptional_future<T>(ResourceException("DBus error return", err));
                               return;
                           }
                           // TODO: See HACK above. Should just be closure(call, qf_);
 
=== modified file 'include/unity/storage/qt/client/internal/remote_client/UploaderImpl.h'
--- include/unity/storage/qt/client/internal/remote_client/UploaderImpl.h	2016-07-22 00:17:24 +0000
+++ include/unity/storage/qt/client/internal/remote_client/UploaderImpl.h	2016-07-29 05:58:49 +0000
@@ -69,7 +69,7 @@
     QDBusUnixFileDescriptor fd_;
     int64_t size_;
     QString old_etag_;
-    std::weak_ptr<Root> root_;
+    std::shared_ptr<Root> root_;
     std::shared_ptr<ProviderInterface> provider_;
     std::shared_ptr<QLocalSocket> write_socket_;
 };
 
=== modified file 'src/qt/client/Account.cpp'
--- src/qt/client/Account.cpp	2016-07-12 02:22:05 +0000
+++ src/qt/client/Account.cpp	2016-07-29 05:58:49 +0000
@@ -41,7 +41,7 @@
 
 Account::~Account() = default;
 
-Runtime* Account::runtime() const
+shared_ptr<Runtime> Account::runtime() const
 {
     return p_->runtime();
 }
 
=== modified file 'src/qt/client/Exceptions.cpp'
--- src/qt/client/Exceptions.cpp	2016-07-22 01:45:39 +0000
+++ src/qt/client/Exceptions.cpp	2016-07-29 05:58:49 +0000
@@ -42,6 +42,11 @@
     return what_string_.c_str();
 }
 
+QString StorageException::error_message() const
+{
+    return error_message_;
+}
+
 LocalCommsException::LocalCommsException(QString const& error_message)
     : StorageException("LocalCommsException", error_message)
 {
@@ -276,8 +281,9 @@
     throw *this;
 }
 
-ResourceException::ResourceException(QString const& error_message)
+ResourceException::ResourceException(QString const& error_message, int error_code)
     : StorageException("ResourceException", error_message)
+    , error_code_(error_code)
 {
 }
 
@@ -293,6 +299,11 @@
     throw *this;
 }
 
+int ResourceException::error_code() const noexcept
+{
+    return error_code_;
+}
+
 }  // namespace client
 }  // namespace qt
 }  // namespace storage
 
=== modified file 'src/qt/client/Item.cpp'
--- src/qt/client/Item.cpp	2016-07-14 00:25:40 +0000
+++ src/qt/client/Item.cpp	2016-07-29 05:58:49 +0000
@@ -51,7 +51,7 @@
     return p_->name();
 }
 
-Root* Item::root() const
+shared_ptr<Root> Item::root() const
 {
     return p_->root();
 }
 
=== modified file 'src/qt/client/Root.cpp'
--- src/qt/client/Root.cpp	2016-07-12 02:22:05 +0000
+++ src/qt/client/Root.cpp	2016-07-29 05:58:49 +0000
@@ -30,6 +30,7 @@
 {
 
 using namespace internal;
+using namespace std;
 
 Root::Root(RootBase* p)
     : Folder(p)
@@ -38,7 +39,7 @@
 
 Root::~Root() = default;
 
-Account* Root::account() const
+shared_ptr<Account> Root::account() const
 {
     return dynamic_cast<RootBase*>(p_.get())->account();
 }
 
=== modified file 'src/qt/client/internal/AccountBase.cpp'
--- src/qt/client/internal/AccountBase.cpp	2016-07-14 04:50:36 +0000
+++ src/qt/client/internal/AccountBase.cpp	2016-07-29 05:58:49 +0000
@@ -19,6 +19,8 @@
 #include <unity/storage/qt/client/internal/AccountBase.h>
 
 #include <unity/storage/qt/client/Exceptions.h>
+#include <unity/storage/qt/client/internal/RuntimeBase.h>
+#include <unity/storage/qt/client/Runtime.h>
 
 #include <cassert>
 
@@ -42,13 +44,18 @@
     assert(runtime.lock());
 }
 
-Runtime* AccountBase::runtime() const
+shared_ptr<Runtime> AccountBase::runtime() const
 {
     if (auto runtime = runtime_.lock())
     {
-        return runtime.get();
+        auto runtime_base = runtime->p_;
+        if (runtime_base->destroyed_)
+        {
+            throw RuntimeDestroyedException("Account::runtime()");
+        }
+        return runtime;
     }
-    throw RuntimeDestroyedException("AccountBase::runtime()");
+    throw RuntimeDestroyedException("Account::runtime()");
 }
 
 void AccountBase::set_public_instance(weak_ptr<Account> const& p)
 
=== modified file 'src/qt/client/internal/ItemBase.cpp'
--- src/qt/client/internal/ItemBase.cpp	2016-07-14 04:50:36 +0000
+++ src/qt/client/internal/ItemBase.cpp	2016-07-29 05:58:49 +0000
@@ -18,7 +18,9 @@
 
 #include <unity/storage/qt/client/internal/ItemBase.h>
 
+#include <unity/storage/qt/client/Account.h>
 #include <unity/storage/qt/client/Exceptions.h>
+#include <unity/storage/qt/client/Root.h>
 
 #include <cassert>
 
@@ -54,13 +56,14 @@
     return type_;
 }
 
-Root* ItemBase::root() const
+shared_ptr<Root> ItemBase::root() const
 {
-    if (auto r = root_.lock())
+    auto root = get_root();
+    if (!root)
     {
-        return r.get();
+        throw RuntimeDestroyedException("Item::root()");
     }
-    throw RuntimeDestroyedException("Item::root()");
+    return root;
 }
 
 void ItemBase::set_root(std::weak_ptr<Root> root)
@@ -75,6 +78,23 @@
     public_instance_ = p;
 }
 
+shared_ptr<Root> ItemBase::get_root() const noexcept
+{
+    try
+    {
+        auto root = root_.lock();
+        if (root)
+        {
+            root->account();  // Throws if either account or runtime has been destroyed.
+            return root;
+        }
+    }
+    catch (RuntimeDestroyedException const&)
+    {
+    }
+    return nullptr;
+}
+
 }  // namespace internal
 }  // namespace client
 }  // namespace qt
 
=== modified file 'src/qt/client/internal/RootBase.cpp'
--- src/qt/client/internal/RootBase.cpp	2016-07-27 02:19:17 +0000
+++ src/qt/client/internal/RootBase.cpp	2016-07-29 05:58:49 +0000
@@ -18,6 +18,7 @@
 
 #include <unity/storage/qt/client/internal/RootBase.h>
 
+#include <unity/storage/qt/client/Account.h>
 #include <unity/storage/qt/client/Exceptions.h>
 
 #include <cassert>
@@ -43,11 +44,19 @@
     assert(account.lock());
 }
 
-Account* RootBase::account() const
+shared_ptr<Account> RootBase::account() const
 {
     if (auto acc = account_.lock())
     {
-        return acc.get();
+        try
+        {
+            acc->runtime();
+        }
+        catch (RuntimeDestroyedException const&)
+        {
+            throw RuntimeDestroyedException("Root::account()");
+        }
+        return acc;
     }
     throw RuntimeDestroyedException("Root::account()");
 }
 
=== modified file 'src/qt/client/internal/RuntimeBase.cpp'
--- src/qt/client/internal/RuntimeBase.cpp	2016-07-12 02:22:05 +0000
+++ src/qt/client/internal/RuntimeBase.cpp	2016-07-29 05:58:49 +0000
@@ -34,11 +34,6 @@
 namespace internal
 {
 
-RuntimeBase::RuntimeBase()
-    : destroyed_(false)
-{
-}
-
 void RuntimeBase::set_public_instance(weak_ptr<Runtime> p)
 {
     assert(p.lock());
 
=== modified file 'src/qt/client/internal/local_client/AccountImpl.cpp'
--- src/qt/client/internal/local_client/AccountImpl.cpp	2016-07-14 04:50:36 +0000
+++ src/qt/client/internal/local_client/AccountImpl.cpp	2016-07-29 05:58:49 +0000
@@ -67,7 +67,7 @@
     if (ec)
     {
         QString msg = "Account::roots(): Cannot stat " + QString(dir) + ": " + QString::fromStdString(ec.message());
-        throw ResourceException(msg);
+        throw ResourceException(msg, errno);
     }
     if (!is_dir)
     {
@@ -85,7 +85,7 @@
         {
             QString msg = "Account::roots(): Cannot create " + QString(dir) + ": "
                           + QString::fromStdString(ec.message());
-            throw ResourceException(msg);
+            throw ResourceException(msg, ec.value());
         }
     }
     return data_dir;
@@ -109,22 +109,32 @@
 
 QString AccountImpl::owner() const
 {
+    runtime();  // Throws RuntimeDestroyedException if runtime was destroyed.
     return owner_;
 }
 
 QString AccountImpl::owner_id() const
 {
+    runtime();  // Throws RuntimeDestroyedException if runtime was destroyed.
     return owner_id_;
 }
 
 QString AccountImpl::description() const
 {
+    runtime();  // Throws RuntimeDestroyedException if runtime was destroyed.
     return description_;
 }
 
 QFuture<QVector<Root::SPtr>> AccountImpl::roots()
 {
-    using namespace boost::filesystem;
+    try
+    {
+        runtime();  // Throws RuntimeDestroyedException if runtime was destroyed.
+    }
+    catch (RuntimeDestroyedException const& e)
+    {
+        return make_exceptional_future<QVector<Root::SPtr>>(e);
+    }
 
     if (!roots_.isEmpty())
     {
@@ -132,6 +142,9 @@
     }
 
     // Create the root on first access.
+
+    using namespace boost::filesystem;
+
     auto rpath = canonical(get_data_dir()).native();
     auto root = RootImpl::make_root(QString::fromStdString(rpath), public_instance_);
     roots_.append(root);
 
=== modified file 'src/qt/client/internal/local_client/DownloaderImpl.cpp'
--- src/qt/client/internal/local_client/DownloaderImpl.cpp	2016-07-22 00:17:24 +0000
+++ src/qt/client/internal/local_client/DownloaderImpl.cpp	2016-07-29 05:58:49 +0000
@@ -79,8 +79,10 @@
     input_file_.reset(new QFile(filename_));
     if (!input_file_->open(QIODevice::ReadOnly))
     {
-        handle_error("cannot open " + filename_ + ": " + input_file_->errorString());
+        // LCOV_EXCL_START
+        handle_error("cannot open " + filename_ + ": " + input_file_->errorString(), input_file_->error());
         return;
+        // LCOV_EXCL_STOP
     }
     bytes_to_write_ = input_file_->size();
 
@@ -136,7 +138,7 @@
         }
         case error:
         {
-            make_exceptional_future(qf_, ResourceException(error_msg_));
+            make_exceptional_future(qf_, ResourceException(error_msg_, error_code_));
             break;
         }
         default:
@@ -189,7 +191,8 @@
 
 void DownloadWorker::on_error()
 {
-    handle_error(write_socket_->errorString());
+    disconnect(write_socket_.get(), nullptr, this, nullptr);
+    handle_error(write_socket_->errorString(), write_socket_->error());
 }
 
 // Read the next chunk of data from the input file and write it to the socket.
@@ -203,25 +206,31 @@
     auto bytes_read = input_file_->read(buf.data(), buf.size());
     if (bytes_read == -1)
     {
-        handle_error(filename_ + ": read error: " + input_file_->errorString());
+        // LCOV_EXCL_START
+        handle_error(filename_ + ": read error: " + input_file_->errorString(), input_file_->error());
         return;
+        // LCOV_EXCL_STOP
     }
     buf.resize(bytes_read);
 
     auto bytes_written = write_socket_->write(buf);
     if (bytes_written == -1)
     {
-        handle_error(filename_ + ": socket error: " + write_socket_->errorString());
+        // LCOV_EXCL_START
+        handle_error(filename_ + ": socket error: " + write_socket_->errorString(), write_socket_->error());
+        // LCOV_EXCL_STOP
     }
     else if (bytes_written != bytes_read)
     {
+        // LCOV_EXCL_START
         QString msg = filename_ + ": write error, requested " + bytes_read + " B, but wrote only "
                       + bytes_written + " B.";
-        handle_error(msg);
+        handle_error(msg, 0);
+        // LCOV_EXCL_STOP
     }
 }
 
-void DownloadWorker::handle_error(QString const& msg)
+void DownloadWorker::handle_error(QString const& msg, int error_code)
 {
     if (state_ == in_progress)
     {
@@ -229,6 +238,7 @@
     }
     state_ = error;
     error_msg_ = "Downloader: " + msg;
+    error_code_ = error_code;
     do_finish();
 }
 
@@ -255,7 +265,7 @@
         // LCOV_EXCL_START
         QString msg = "Downloader: cannot create socket pair: "
                       + QString::fromStdString(storage::internal::safe_strerror(errno));
-        make_exceptional_future(qf_, ResourceException(msg));
+        make_exceptional_future(qf_, ResourceException(msg, errno));
         return;
         // LCOV_EXCL_STOP
     }
 
=== modified file 'src/qt/client/internal/local_client/FileImpl.cpp'
--- src/qt/client/internal/local_client/FileImpl.cpp	2016-07-22 01:45:39 +0000
+++ src/qt/client/internal/local_client/FileImpl.cpp	2016-07-29 05:58:49 +0000
@@ -50,38 +50,52 @@
 
 QString FileImpl::name() const
 {
-    lock_guard<mutex> guard(mutex_);
+    lock_guard<decltype(mutex_)> guard(mutex_);
 
     if (deleted_)
     {
         throw deleted_ex("File::name()");
     }
+    if (!get_root())
+    {
+        throw RuntimeDestroyedException("File::name()");
+    }
     return name_;
 }
 
 int64_t FileImpl::size() const
 {
-    lock_guard<mutex> guard(mutex_);
+    lock_guard<decltype(mutex_)> guard(mutex_);
 
     if (deleted_)
     {
         throw deleted_ex("File::size()");
     }
+    if (!get_root())
+    {
+        throw RuntimeDestroyedException("File::size()");
+    }
 
     try
     {
         boost::filesystem::path p = identity_.toStdString();
         return file_size(p);
     }
+    catch (boost::filesystem::filesystem_error const& e)
+    {
+        throw ResourceException(e.what(), e.code().value());
+    }
+    // LCOV_EXCL_START
     catch (std::exception const& e)
     {
-        throw ResourceException(e.what());
+        throw ResourceException(e.what(), 0);
     }
+    // LCOV_EXCL_STOP
 }
 
 QFuture<Uploader::SPtr> FileImpl::create_uploader(ConflictPolicy policy, int64_t size)
 {
-    lock_guard<mutex> guard(mutex_);
+    lock_guard<decltype(mutex_)> guard(mutex_);
 
     if (deleted_)
     {
@@ -92,6 +106,11 @@
         QString msg = "File::create_uploader(): size must be >= 0";
         return make_exceptional_future<shared_ptr<Uploader>>(InvalidArgumentException(msg));
     }
+    auto root = get_root();
+    if (!root)
+    {
+        return make_exceptional_future<Uploader::SPtr>(RuntimeDestroyedException("File::create_uploader()"));
+    }
 
     auto file = dynamic_pointer_cast<File>(public_instance_.lock());
     assert(file);
@@ -102,12 +121,16 @@
 
 QFuture<Downloader::SPtr> FileImpl::create_downloader()
 {
-    lock_guard<mutex> guard(mutex_);
+    lock_guard<decltype(mutex_)> guard(mutex_);
 
     if (deleted_)
     {
         return make_exceptional_future<Downloader::SPtr>(deleted_ex("File::create_downloader()"));
     }
+    if (!get_root())
+    {
+        throw RuntimeDestroyedException("File::create_downloader()");
+    }
 
     auto pi = public_instance_.lock();
     assert(pi);
 
=== modified file 'src/qt/client/internal/local_client/FolderImpl.cpp'
--- src/qt/client/internal/local_client/FolderImpl.cpp	2016-07-22 01:45:39 +0000
+++ src/qt/client/internal/local_client/FolderImpl.cpp	2016-07-29 05:58:49 +0000
@@ -62,16 +62,45 @@
 {
 }
 
+QString FolderImpl::name() const
+{
+    lock_guard<decltype(mutex_)> guard(mutex_);
+
+    if (deleted_)
+    {
+        throw deleted_ex("Folder::name()");
+    }
+    if (!get_root())
+    {
+        throw RuntimeDestroyedException("Folder::name()");
+    }
+    return name_;
+}
+
 QFuture<QVector<Item::SPtr>> FolderImpl::list() const
 {
+    if (deleted_)
+    {
+        return make_exceptional_future<QVector<Item::SPtr>>(deleted_ex("Folder::list()"));
+    }
+    if (!get_root())
+    {
+        return make_exceptional_future<QVector<Item::SPtr>>(RuntimeDestroyedException("Folder::list()"));
+    }
+
     auto This = dynamic_pointer_cast<FolderImpl const>(shared_from_this());  // Keep this folder alive while the lambda is alive.
     auto list = [This]()
     {
-        lock_guard<mutex> guard(This->mutex_);
+        lock_guard<decltype(mutex_)> guard(This->mutex_);
 
         if (This->deleted_)
         {
-            throw This->deleted_ex("Folder::list()");
+            throw This->deleted_ex("Folder::list()");  // LCOV_EXCL_LINE
+        }
+        auto root = This->get_root();
+        if (!root)
+        {
+            throw RuntimeDestroyedException("Folder::list()");  // LCOV_EXCL_LINE
         }
 
         try
@@ -90,11 +119,11 @@
                 QString path = QString::fromStdString(dirent.path().native());
                 if (is_directory(s))
                 {
-                    results.append(make_folder(path, This->root_));
+                    results.append(make_folder(path, root));
                 }
                 else if (is_regular_file(s))
                 {
-                    results.append(FileImpl::make_file(path, This->root_));
+                    results.append(FileImpl::make_file(path, root));
                 }
                 else
                 {
@@ -103,24 +132,48 @@
             }
             return results;
         }
+        // LCOV_EXCL_START
+        catch (StorageException const&)
+        {
+            throw;
+        }
+        catch (boost::filesystem::filesystem_error const& e)
+        {
+            throw ResourceException(QString("Folder::list(): ") + e.what(), e.code().value());
+        }
         catch (std::exception const& e)
         {
-            throw ResourceException(QString("Folder::list(): ") + e.what());
+            throw ResourceException(QString("Folder::list(): ") + e.what(), errno);
         }
+        // LCOV_EXCL_STOP
     };
     return QtConcurrent::run(list);
 }
 
 QFuture<QVector<Item::SPtr>> FolderImpl::lookup(QString const& name) const
 {
+    if (deleted_)
+    {
+        return make_exceptional_future<QVector<Item::SPtr>>(deleted_ex("Folder::lookup()"));
+    }
+    if (!get_root())
+    {
+        return make_exceptional_future<QVector<Item::SPtr>>(RuntimeDestroyedException("Folder::lookup()"));
+    }
+
     auto This = dynamic_pointer_cast<FolderImpl const>(shared_from_this());  // Keep this folder alive while the lambda is alive.
     auto lookup = [This, name]() -> QVector<Item::SPtr>
     {
-        lock_guard<mutex> guard(This->mutex_);
+        lock_guard<decltype(mutex_)> guard(This->mutex_);
 
         if (This->deleted_)
         {
-            throw This->deleted_ex("Folder::lookup()");
+            throw This->deleted_ex("Folder::lookup()");  // LCOV_EXCL_LINE
+        }
+        auto root = This->get_root();
+        if (!root)
+        {
+            throw RuntimeDestroyedException("Folder::lookup()");  // LCOV_EXCL_LINE
         }
 
         try
@@ -131,45 +184,56 @@
             auto sanitized_name = sanitize(name, "Folder::lookup()");
             if (is_reserved_path(sanitized_name))
             {
-                throw NotExistsException("Folder::lookup(): no such item: " + name, name);
+                throw NotExistsException("Folder::lookup(): no such item: \"" + name + "\"", name);
             }
             p /= sanitized_name;
             file_status s = status(p);
             if (is_directory(s))
             {
                 QVector<Item::SPtr> v;
-                v.append(make_folder(QString::fromStdString(p.native()), This->root_));
+                v.append(make_folder(QString::fromStdString(p.native()), root));
                 return v;
             }
             if (is_regular_file(s))
             {
                 QVector<Item::SPtr> v;
-                v.append(FileImpl::make_file(QString::fromStdString(p.native()), This->root_));
+                v.append(FileImpl::make_file(QString::fromStdString(p.native()), root));
                 return v;
             }
-            throw NotExistsException("Folder::lookup(): no such item: " + name, name);
+            throw NotExistsException("Folder::lookup(): no such item: \"" + name + "\"", name);
         }
-        catch (StorageException const&)
+        catch (StorageException const& e)
         {
             throw;
         }
+        // LCOV_EXCL_START
+        catch (boost::filesystem::filesystem_error const& e)
+        {
+            throw ResourceException(QString("Folder::lookup(): ") + e.what(), e.code().value());
+        }
         catch (std::exception const& e)
         {
-            throw ResourceException(QString("Folder::lookup(): ") + e.what());
+            throw ResourceException(QString("Folder::lookup(): ") + e.what(), errno);
         }
+        // LCOV_EXCL_STOP
     };
     return QtConcurrent::run(lookup);
 }
 
 QFuture<Folder::SPtr> FolderImpl::create_folder(QString const& name)
 {
-    lock_guard<mutex> guard(mutex_);
+    lock_guard<decltype(mutex_)> guard(mutex_);
 
     QFutureInterface<Folder::SPtr> qf;
     if (deleted_)
     {
         return make_exceptional_future<Folder::SPtr>(deleted_ex("Folder::create_folder()"));
     }
+    auto root = get_root();
+    if (!root)
+    {
+        return make_exceptional_future<Folder::SPtr>(RuntimeDestroyedException("Folder::create_folder()"));
+    }
 
     try
     {
@@ -179,22 +243,39 @@
         auto sanitized_name = sanitize(name, "Folder::create_folder()");
         if (is_reserved_path(sanitized_name))
         {
-            QString msg = "Folder::create_folder(): names beginning with " + QString(TMPFILE_PREFIX) + " are reserved";
-            return make_exceptional_future<Folder::SPtr>(InvalidArgumentException(msg));
+            QString msg = "Folder::create_folder(): names beginning with \"" + QString(TMPFILE_PREFIX) + "\" are reserved";
+            throw InvalidArgumentException(msg);
         }
         p /= sanitized_name;
+        if (exists(p))
+        {
+            QString msg = "Folder::create_folder(): item with name \"" + name + "\" exists already";
+            throw ExistsException(msg, native_identity() + "/" + name, name);
+        }
         create_directory(p);
-        return make_ready_future(make_folder(QString::fromStdString(p.native()), root_));
-    }
+        return make_ready_future(make_folder(QString::fromStdString(p.native()), root));
+    }
+    catch (StorageException const& e)
+    {
+        return make_exceptional_future<Folder::SPtr>(e);
+    }
+    catch (boost::filesystem::filesystem_error const& e)
+    {
+        return make_exceptional_future<Folder::SPtr>(ResourceException(QString("Folder::create_folder(): ") + e.what(),
+                                                                       e.code().value()));
+    }
+    // LCOV_EXCL_START
     catch (std::exception const& e)
     {
-        return make_exceptional_future<Folder::SPtr>(ResourceException(QString("Folder::create_folder: ") + e.what()));
+        return make_exceptional_future<Folder::SPtr>(ResourceException(QString("Folder::create_folder(): ") + e.what(),
+                                                                       errno));
     }
+    // LCOV_EXCL_STOP
 }
 
 QFuture<shared_ptr<Uploader>> FolderImpl::create_file(QString const& name, int64_t size)
 {
-    unique_lock<mutex> guard(mutex_);
+    lock_guard<decltype(mutex_)> guard(mutex_);
 
     if (deleted_)
     {
@@ -205,6 +286,11 @@
         QString msg = "Folder::create_file(): size must be >= 0";
         return make_exceptional_future<shared_ptr<Uploader>>(InvalidArgumentException(msg));
     }
+    auto root = get_root();
+    if (!root)
+    {
+        return make_exceptional_future<Uploader::SPtr>(RuntimeDestroyedException("Folder::create_file()"));
+    }
 
     try
     {
@@ -214,27 +300,39 @@
         auto sanitized_name = sanitize(name, "Folder::create_file()");
         if (is_reserved_path(sanitized_name))
         {
-            QString msg = "Folder::create_file(): names beginning with " + QString(TMPFILE_PREFIX) + " are reserved";
-            return make_exceptional_future<Uploader::SPtr>(InvalidArgumentException(msg));
+            QString msg = "Folder::create_file(): names beginning with \"" + QString(TMPFILE_PREFIX) + "\" are reserved";
+            throw InvalidArgumentException(msg);
         }
         p /= sanitized_name;
         if (exists(p))
         {
             QString msg = "Folder::create_file(): item with name \"" + name + "\" exists already";
-            return make_exceptional_future<Uploader::SPtr>(ExistsException(msg, native_identity(), name));
+            throw ExistsException(msg, native_identity() + "/" + name, name);
         }
         auto impl = new UploaderImpl(shared_ptr<File>(),
                                      size,
                                      QString::fromStdString(p.native()),
                                      ConflictPolicy::error_if_conflict,
-                                     root_);
+                                     root);
         Uploader::SPtr uploader(new Uploader(impl));
         return make_ready_future(uploader);
     }
+    catch (StorageException const& e)
+    {
+        return make_exceptional_future<Uploader::SPtr>(e);
+    }
+    catch (boost::filesystem::filesystem_error const& e)
+    {
+        return make_exceptional_future<Uploader::SPtr>(ResourceException(QString("Folder::create_file(): ") + e.what(),
+                                                                         e.code().value()));
+    }
+    // LCOV_EXCL_START
     catch (std::exception const& e)
     {
-        return make_exceptional_future<Uploader::SPtr>(ResourceException(QString("Folder::create_file: ") + e.what()));
+        return make_exceptional_future<Uploader::SPtr>(ResourceException(QString("Folder::create_file(): ") + e.what(),
+                                                                         errno));
     }
+    // LCOV_EXCL_STOP
 }
 
 Folder::SPtr FolderImpl::make_folder(QString const& identity, weak_ptr<Root> root)
 
=== modified file 'src/qt/client/internal/local_client/ItemImpl.cpp'
--- src/qt/client/internal/local_client/ItemImpl.cpp	2016-07-22 00:17:24 +0000
+++ src/qt/client/internal/local_client/ItemImpl.cpp	2016-07-29 05:58:49 +0000
@@ -64,102 +64,86 @@
 
 ItemImpl::~ItemImpl() = default;
 
-QString ItemImpl::name() const
-{
-    lock_guard<mutex> guard(mutex_);
-
-    if (deleted_)
-    {
-        throw deleted_ex("Item::name()");
-    }
-    return name_;
-}
-
 QString ItemImpl::etag() const
 {
-    lock_guard<mutex> guard(mutex_);
+    lock_guard<decltype(mutex_)> guard(mutex_);
 
     if (deleted_)
     {
         throw deleted_ex("Item::etag()");
     }
+    if (!get_root())
+    {
+        throw RuntimeDestroyedException("Item::etag()");
+    }
     return etag_;
 }
 
 QVariantMap ItemImpl::metadata() const
 {
-    lock_guard<mutex> guard(mutex_);
+    lock_guard<decltype(mutex_)> guard(mutex_);
 
     if (deleted_)
     {
         throw deleted_ex("Item::metadata()");
     }
+    if (!get_root())
+    {
+        throw RuntimeDestroyedException("Item::metadata()");
+    }
     return metadata_;
 }
 
 QDateTime ItemImpl::last_modified_time() const
 {
-    lock_guard<mutex> guard(mutex_);
+    lock_guard<decltype(mutex_)> guard(mutex_);
 
     if (deleted_)
     {
         throw deleted_ex("Item::last_modified_time()");
     }
+    if (!get_root())
+    {
+        throw RuntimeDestroyedException("Item::last_modified_time()");
+    }
     return modified_time_;
 }
 
-namespace
-{
-
-using namespace boost::filesystem;
-
-void copy_recursively(path const& source, path const& target)
-{
-    auto s = status(source);
-    if (is_regular_file(s))
-    {
-        copy_file(source, target);
-        return;
-    }
-    else if (is_directory(s))
-    {
-        copy_directory(source, target);  // Poorly named in boost; this creates the target dir without recursion
-        for (directory_iterator it(source); it != directory_iterator(); ++it)
-        {
-            path source_entry = it->path();
-            path target_entry = target;
-            target_entry /= source_entry.filename();
-            copy_recursively(source_entry, target_entry);
-        }
-    }
-    else
-    {
-        // Ignore everything that's not a directory or file.
-    }
-}
-
-}  // namespace
-
 QFuture<shared_ptr<Item>> ItemImpl::copy(shared_ptr<Folder> const& new_parent, QString const& new_name)
 {
+    if (!new_parent)
+    {
+        QString msg = "Item::copy(): new_parent cannot be nullptr";
+        return make_exceptional_future<shared_ptr<Item>>(InvalidArgumentException(msg));
+    }
+    if (!get_root())
+    {
+        return make_exceptional_future<shared_ptr<Item>>(RuntimeDestroyedException("Item::copy()"));
+    }
+
     auto This = dynamic_pointer_cast<ItemImpl>(shared_from_this());  // Keep this item alive while the lambda is alive.
     auto copy = [This, new_parent, new_name]() -> Item::SPtr
     {
         auto new_parent_impl = dynamic_pointer_cast<FolderImpl>(new_parent->p_);
 
         lock(This->mutex_, new_parent_impl->mutex_);
-        lock_guard<mutex> this_guard(This->mutex_, std::adopt_lock);
-        lock_guard<mutex> other_guard(new_parent_impl->mutex_, adopt_lock);
-
-        if (This->deleted_ || new_parent_impl->deleted_)
-        {
-            throw This->deleted_ex("Item::copy");
-        }
-
-        if (This->root()->account() != new_parent->root()->account())
+        lock_guard<decltype(mutex_)> this_guard(This->mutex_, std::adopt_lock);
+        lock_guard<decltype(mutex_)> other_guard(new_parent_impl->mutex_, adopt_lock);
+
+        if (This->deleted_)
+        {
+            throw This->deleted_ex("Item::copy()");
+        }
+        if (new_parent_impl->deleted_)
+        {
+            throw new_parent_impl->deleted_ex("Item::copy()");
+        }
+
+        // TODO: This needs to deeply compare account identity because the client may have refreshed the accounts list.
+        if (This->root()->account() != new_parent->root()->account())  // Throws if account or runtime were destroyed.
         {
             // Can't do cross-account copy.
-            QString msg = QString("Item::copy(): Source (") + This->name_ + ") and target ("
+            QString msg = QString("Item::copy(): source (") + This->name_ + ") and target ("
                           + new_name + ") must belong to the same account";
             throw LogicException(msg);
         }
@@ -175,22 +159,22 @@
             target_path /= sanitized_name;
             if (is_reserved_path(target_path))
             {
-                QString msg = "Item::copy(): names beginning with " + QString(TMPFILE_PREFIX) + " are reserved";
+                QString msg = "Item::copy(): names beginning with \"" + QString(TMPFILE_PREFIX) + "\" are reserved";
                 throw InvalidArgumentException(msg);
             }
 
+            if (exists(target_path))
+            {
+                QString msg = "Item::copy(): item with name \"" + new_name + "\" exists already";
+                throw ExistsException(msg, This->identity_, This->name_);
+            }
+
             if (This->type_ == ItemType::file)
             {
                 copy_file(source_path, target_path);
                 return FileImpl::make_file(QString::fromStdString(target_path.native()), new_parent_impl->root_);
             }
 
-            if (exists(target_path))
-            {
-                QString msg = "Item::copy(): item with name \"" + new_name + "\" exists already";
-                throw ExistsException(msg, This->identity_, This->name_);
-            }
-
             // For recursive copy, we create a temporary directory in lieu of target_path and recursively copy
             // everything into the temporary directory. This ensures that we don't invalidate directory iterators
             // by creating things while we are iterating, potentially getting trapped in an infinite loop.
@@ -199,7 +183,7 @@
             create_directories(tmp_path);
             for (directory_iterator it(source_path); it != directory_iterator(); ++it)
             {
-                if (tmp_path.compare(canonical(it->path())) == 0)
+                if (is_reserved_path(it->path()))
                 {
                     continue;  // Don't recurse into the temporary directory
                 }
@@ -209,47 +193,72 @@
                     path source_entry = it->path();
                     path target_entry = tmp_path;
                     target_entry /= source_entry.filename();
-                    copy_recursively(source_entry, target_entry);
+                    ItemImpl::copy_recursively(source_entry, target_entry);
                 }
             }
             rename(tmp_path, target_path);
             return FolderImpl::make_folder(QString::fromStdString(target_path.native()), new_parent_impl->root_);
         }
+        catch (StorageException const&)
+        {
+            throw;
+        }
+        catch (boost::filesystem::filesystem_error const& e)
+        {
+            throw ResourceException(QString("Item::copy(): ") + e.what(), e.code().value());
+        }
+        // LCOV_EXCL_START
         catch (std::exception const& e)
         {
-            throw ResourceException(QString("Item::copy(): ") + e.what());
+            throw ResourceException(QString("Item::copy(): ") + e.what(), errno);
         }
+        // LCOV_EXCL_STOP
     };
     return QtConcurrent::run(copy);
 }
 
 QFuture<shared_ptr<Item>> ItemImpl::move(shared_ptr<Folder> const& new_parent, QString const& new_name)
 {
+    if (!new_parent)
+    {
+        QString msg = "Item::move(): new_parent cannot be nullptr";
+        return make_exceptional_future<shared_ptr<Item>>(InvalidArgumentException(msg));
+    }
+    if (!get_root())
+    {
+        return make_exceptional_future<shared_ptr<Item>>(RuntimeDestroyedException("Item::move()"));
+    }
+
     auto This = dynamic_pointer_cast<ItemImpl>(shared_from_this());  // Keep this item alive while the lambda is alive.
     auto move = [This, new_parent, new_name]() -> Item::SPtr
     {
         auto new_parent_impl = dynamic_pointer_cast<FolderImpl>(new_parent->p_);
 
         lock(This->mutex_, new_parent_impl->mutex_);
-        lock_guard<mutex> this_guard(This->mutex_, std::adopt_lock);
-        lock_guard<mutex> other_guard(new_parent_impl->mutex_, adopt_lock);
-
-        if (This->deleted_ || new_parent_impl->deleted_)
-        {
-            throw This->deleted_ex("Item::move");
-        }
-
-        if (This->root()->account() != new_parent->root()->account())
+        lock_guard<decltype(mutex_)> this_guard(This->mutex_, std::adopt_lock);
+        lock_guard<decltype(mutex_)> other_guard(new_parent_impl->mutex_, adopt_lock);
+
+        if (This->deleted_)
+        {
+            throw This->deleted_ex("Item::move()");
+        }
+        if (new_parent_impl->deleted_)
+        {
+            throw new_parent_impl->deleted_ex("Item::move()");
+        }
+
+        // TODO: This needs to deeply compare account identity because the client may have refreshed the accounts list.
+        if (This->root()->account() != new_parent->root()->account())  // Throws if account or runtime were destroyed.
         {
             // Can't do cross-account move.
-            QString msg = QString("Item::move(): Source (") + This->name_ + ") and target ("
+            QString msg = QString("Item::move(): source (") + This->name_ + ") and target ("
                           + new_name + ") must belong to the same account";
             throw LogicException(msg);
         }
         if (This->type_ == ItemType::root)
         {
             // Can't move a root.
-            throw LogicException("Item::move(): Cannot move root folder");
+            throw LogicException("Item::move(): cannot move root folder");
         }
 
         try
@@ -265,7 +274,7 @@
             }
             if (is_reserved_path(target_path))
             {
-                QString msg = "Item::move(): names beginning with " + QString(TMPFILE_PREFIX) + " are reserved";
+                QString msg = "Item::move(): names beginning with \"" + QString(TMPFILE_PREFIX) + "\" are reserved";
                 throw InvalidArgumentException(msg);
             }
             rename(This->native_identity().toStdString(), target_path);
@@ -276,25 +285,34 @@
             }
             return FileImpl::make_file(QString::fromStdString(target_path.native()), new_parent_impl->root_);
         }
+        catch (StorageException const&)
+        {
+            throw;
+        }
+        catch (boost::filesystem::filesystem_error const& e)
+        {
+            throw ResourceException(QString("Item::move(): ") + e.what(), e.code().value());
+        }
+        // LCOV_EXCL_START
         catch (std::exception const& e)
         {
-            throw ResourceException(QString("Item::move(): ") + e.what());
+            throw ResourceException(QString("Item::move(): ") + e.what(), errno);
         }
+        // LCOV_EXCL_STOP
     };
     return QtConcurrent::run(move);
 }
 
 QFuture<QVector<Folder::SPtr>> ItemImpl::parents() const
 {
-    lock_guard<mutex> guard(mutex_);
+    lock_guard<decltype(mutex_)> guard(mutex_);
 
     QFutureInterface<QVector<Folder::SPtr>> qf;
     if (deleted_)
     {
         return make_exceptional_future<QVector<Folder::SPtr>>(deleted_ex("Item::parents()"));
     }
-
-    Root::SPtr root = root_.lock();
+    auto root = get_root();
     if (!root)
     {
         return make_exceptional_future<QVector<Folder::SPtr>>(RuntimeDestroyedException("Item::parents()"));
@@ -309,7 +327,7 @@
     QVector<Folder::SPtr> results;
     if (parent_path != root->native_identity())
     {
-        results.append(FolderImpl::make_folder(parent_path, root_));
+        results.append(FolderImpl::make_folder(parent_path, root));
     }
     else
     {
@@ -320,12 +338,16 @@
 
 QVector<QString> ItemImpl::parent_ids() const
 {
-    lock_guard<mutex> guard(mutex_);
+    lock_guard<decltype(mutex_)> guard(mutex_);
 
     if (deleted_)
     {
         throw deleted_ex("Item::parent_ids()");
     }
+    if (!get_root())
+    {
+        throw RuntimeDestroyedException("Item::parent_ids()");
+    }
 
     using namespace boost::filesystem;
 
@@ -343,33 +365,63 @@
     auto This = dynamic_pointer_cast<ItemImpl>(shared_from_this());  // Keep this item alive while the lambda is alive.
     auto destroy = [This]()
     {
-        lock_guard<mutex> guard(This->mutex_);
+        lock_guard<decltype(mutex_)> guard(This->mutex_);
 
         if (This->deleted_)
         {
             throw This->deleted_ex("Item::delete_item()");
         }
+        if (!This->get_root())
+        {
+            throw RuntimeDestroyedException("Item::delete_item()");
+        }
 
         try
         {
             boost::filesystem::remove_all(This->native_identity().toStdString());
             This->deleted_ = true;
         }
+        catch (boost::filesystem::filesystem_error const& e)
+        {
+            throw ResourceException(QString("Item::delete_item(): ") + e.what(), e.code().value());
+        }
+        // LCOV_EXCL_START
         catch (std::exception const& e)
         {
-            throw ResourceException(QString("Item::delete_item(): ") + e.what());
+            throw ResourceException(QString("Item::delete_item(): ") + e.what(), errno);
         }
+        // LCOV_EXCL_STOP
     };
     return QtConcurrent::run(destroy);
 }
 
 QDateTime ItemImpl::creation_time() const
 {
+    lock_guard<decltype(mutex_)> guard(mutex_);
+
+    if (deleted_)
+    {
+        throw deleted_ex("Item::creation_time()");
+    }
+    if (!get_root())
+    {
+        throw RuntimeDestroyedException("Item::creation_time()");
+    }
     return QDateTime();
 }
 
 MetadataMap ItemImpl::native_metadata() const
 {
+    lock_guard<decltype(mutex_)> guard(mutex_);
+
+    if (deleted_)
+    {
+        throw deleted_ex("Item::native_metadata()");
+    }
+    if (!get_root())
+    {
+        throw RuntimeDestroyedException("Item::native_metadata()");
+    }
     return MetadataMap();
 }
 
@@ -383,8 +435,8 @@
     }
 
     lock(mutex_, other_impl->mutex_);
-    lock_guard<mutex> this_guard(mutex_, std::adopt_lock);
-    lock_guard<mutex> other_guard(other_impl->mutex_, adopt_lock);
+    lock_guard<decltype(mutex_)> this_guard(mutex_, std::adopt_lock);
+    lock_guard<decltype(mutex_)> other_guard(other_impl->mutex_, adopt_lock);
 
     if (deleted_ || other_impl->deleted_)
     {
@@ -395,7 +447,7 @@
 
 void ItemImpl::set_timestamps() noexcept
 {
-    lock_guard<mutex> guard(mutex_);
+    lock_guard<decltype(mutex_)> guard(mutex_);
 
     string id = identity_.toStdString();
     // Use nano-second resolution for the ETag, if the file system supports it.
@@ -412,7 +464,7 @@
 
 bool ItemImpl::has_conflict() const noexcept
 {
-    lock_guard<mutex> guard(mutex_);
+    lock_guard<decltype(mutex_)> guard(mutex_);
 
     string id = identity_.toStdString();
     struct stat st;
@@ -425,11 +477,6 @@
     return etag_ != new_etag;
 }
 
-unique_lock<mutex> ItemImpl::get_lock()
-{
-    return unique_lock<mutex>(mutex_);
-}
-
 // Throw if name contains more than one path component.
 // Otherwise, return the relative path for the name.
 // This is to make sure that calling, say, create_file()
@@ -467,10 +514,41 @@
 
 DeletedException ItemImpl::deleted_ex(QString const& method) const noexcept
 {
-    QString msg = method + ": " + identity_ + " was deleted previously";
+    QString msg = method + ": \"" + identity_ + "\" was deleted previously";
     return DeletedException(msg, identity_, name_);
 }
 
+void ItemImpl::copy_recursively(boost::filesystem::path const& source, boost::filesystem::path const& target)
+{
+    using namespace boost::filesystem;
+
+    if (is_reserved_path(source))
+    {
+        return;  // Don't copy temporary directories.
+    }
+
+    auto s = status(source);
+    if (is_regular_file(s))
+    {
+        copy_file(source, target);
+    }
+    else if (is_directory(s))
+    {
+        copy_directory(source, target);  // Poorly named in boost; this creates the target dir without recursion
+        for (directory_iterator it(source); it != directory_iterator(); ++it)
+        {
+            path source_entry = it->path();
+            path target_entry = target;
+            target_entry /= source_entry.filename();
+            copy_recursively(source_entry, target_entry);
+        }
+    }
+    else
+    {
+        // Ignore everything that's not a directory or file.
+    }
+}
+
 }  // namespace local_client
 }  // namespace internal
 }  // namespace client
 
=== modified file 'src/qt/client/internal/local_client/RootImpl.cpp'
--- src/qt/client/internal/local_client/RootImpl.cpp	2016-07-15 03:34:00 +0000
+++ src/qt/client/internal/local_client/RootImpl.cpp	2016-07-29 05:58:49 +0000
@@ -68,27 +68,58 @@
 
 QString RootImpl::name() const
 {
+    lock_guard<decltype(mutex_)> guard(mutex_);
+
+    if (!get_root())
+    {
+        throw RuntimeDestroyedException("Root::name()");
+    }
     return "";
 }
 
 QFuture<QVector<Folder::SPtr>> RootImpl::parents() const
 {
+    lock_guard<decltype(mutex_)> guard(mutex_);
+
+    if (!get_root())
+    {
+        throw RuntimeDestroyedException("Root::parents()");
+    }
     return make_ready_future(QVector<Folder::SPtr>());  // For the root, we return an empty vector.
 }
 
 QVector<QString> RootImpl::parent_ids() const
 {
+    lock_guard<decltype(mutex_)> guard(mutex_);
+
+    if (!get_root())
+    {
+        throw RuntimeDestroyedException("Root::parent_ids()");
+    }
     return QVector<QString>();  // For the root, we return an empty vector.
 }
 
 QFuture<void> RootImpl::delete_item()
 {
+    lock_guard<decltype(mutex_)> guard(mutex_);
+
+    if (!get_root())
+    {
+        throw RuntimeDestroyedException("Root::delete_item()");
+    }
     // Cannot delete root.
     return make_exceptional_future(LogicException("Root::delete_item(): Cannot delete root folder"));
 }
 
 QFuture<int64_t> RootImpl::free_space_bytes() const
 {
+    lock_guard<decltype(mutex_)> guard(mutex_);
+
+    if (!get_root())
+    {
+        throw RuntimeDestroyedException("Root::free_space_bytes()");
+    }
+
     using namespace boost::filesystem;
 
     try
@@ -96,14 +127,29 @@
         space_info si = space(identity_.toStdString());
         return make_ready_future<int64_t>(si.available);
     }
+    // LCOV_EXCL_START
+    catch (boost::filesystem::filesystem_error const& e)
+    {
+        return make_exceptional_future<int64_t>(ResourceException(QString("Root::free_space_bytes(): ") + e.what(),
+                                                                  e.code().value()));
+    }
     catch (std::exception const& e)
     {
-        return make_exceptional_future<int64_t>(ResourceException(QString("Root::free_space_bytes(): ") + e.what()));
+        return make_exceptional_future<int64_t>(ResourceException(QString("Root::free_space_bytes(): ") + e.what(),
+                                                                  errno));
     }
+    // LCOV_EXCL_STOP
 }
 
 QFuture<int64_t> RootImpl::used_space_bytes() const
 {
+    lock_guard<decltype(mutex_)> guard(mutex_);
+
+    if (!get_root())
+    {
+        throw RuntimeDestroyedException("Root::used_space_bytes()");
+    }
+
     using namespace boost::filesystem;
 
     try
@@ -111,14 +157,30 @@
         space_info si = space(identity_.toStdString());
         return make_ready_future<int64_t>(si.capacity - si.available);
     }
+    // LCOV_EXCL_START
+    catch (boost::filesystem::filesystem_error const& e)
+    {
+        return make_exceptional_future<int64_t>(ResourceException(QString("Root::used_space_bytes(): ") + e.what(),
+                                                                  e.code().value()));
+    }
     catch (std::exception const& e)
     {
-        return make_exceptional_future<int64_t>(ResourceException(QString("Root::used_space_bytes(): ") + e.what()));
+        return make_exceptional_future<int64_t>(ResourceException(QString("Root::used_space_bytes(): ") + e.what(),
+                                                                  errno));
     }
+    // LCOV_EXCL_STOP
 }
 
 QFuture<Item::SPtr> RootImpl::get(QString native_identity) const
 {
+    lock_guard<decltype(mutex_)> guard(mutex_);
+
+    auto root = get_root();
+    if (!root)
+    {
+        return make_exceptional_future<Item::SPtr>(RuntimeDestroyedException("Root::get()"));
+    }
+
     using namespace boost::filesystem;
 
     QFutureInterface<Item::SPtr> qf;
@@ -127,13 +189,13 @@
         path id_path = native_identity.toStdString();
         if (!id_path.is_absolute())
         {
-            QString msg = "Root::get(): identity must be an absolute path";
-            return make_exceptional_future<Item::SPtr>(InvalidArgumentException(msg));
+            QString msg = "Root::get(): identity \"" + native_identity + "\" must be an absolute path";
+            throw InvalidArgumentException(msg);
         }
 
         // Make sure that native_identity is contained in or equal to the root path.
         id_path = canonical(id_path);
-        auto root_path = path(root()->native_identity().toStdString());
+        auto root_path = path(root->native_identity().toStdString());
         auto id_len = std::distance(id_path.begin(), id_path.end());
         auto root_len = std::distance(root_path.begin(), root_path.end());
         if (id_len < root_len || !std::equal(root_path.begin(), root_path.end(), id_path.begin()))
@@ -141,14 +203,14 @@
             // Too few components, or wrong path prefix. Therefore, native_identity can't
             // possibly point at something below the root.
             QString msg = QString("Root::get(): identity \"") + native_identity + "\" points outside the root folder";
-            return make_exceptional_future<Item::SPtr>(InvalidArgumentException(msg));
+            throw InvalidArgumentException(msg);
         }
 
         // Don't allow reserved files to be found.
         if (is_reserved_path(id_path))
         {
-            QString msg = "Root::get(): no such item: " + native_identity;
-            return make_exceptional_future<Item::SPtr>(NotExistsException(msg, native_identity));
+            QString msg = "Root::get(): no such item: \"" + native_identity + "\"";
+            throw NotExistsException(msg, native_identity);
         }
 
         file_status s = status(id_path);
@@ -157,21 +219,31 @@
         {
             if (id_path == root_path)
             {
-                return make_ready_future<Item::SPtr>(make_root(path, account_));
+                return make_ready_future<Item::SPtr>(make_root(path, account()));
             }
-            return make_ready_future<Item::SPtr>(make_folder(path, root_));
+            return make_ready_future<Item::SPtr>(make_folder(path, root));
         }
         if (is_regular_file(s))
         {
-            return make_ready_future<Item::SPtr>(FileImpl::make_file(path, root_));
+            return make_ready_future<Item::SPtr>(FileImpl::make_file(path, root));
         }
-        QString msg = "Root::get(): no such item: " + native_identity;
-        return make_exceptional_future<Item::SPtr>(NotExistsException(msg, native_identity));
-    }
+        QString msg = "Root::get(): no such item: \"" + native_identity + "\"";
+        throw NotExistsException(msg, native_identity);
+    }
+    catch (StorageException const& e)
+    {
+        return make_exceptional_future<Item::SPtr>(e);
+    }
+    catch (boost::filesystem::filesystem_error const& e)
+    {
+        return make_exceptional_future<Item::SPtr>(QString("Root::get(): ") + e.what(), e, native_identity);
+    }
+    // LCOV_EXCL_START
     catch (std::exception const& e)
     {
-        return make_exceptional_future<Item::SPtr>(ResourceException(QString("Root::get(): ") + e.what()));
+        return make_exceptional_future<Item::SPtr>(ResourceException(QString("Root::get(): ") + e.what(), errno));
     }
+    // LCOV_EXCL_STOP
 }
 
 Root::SPtr RootImpl::make_root(QString const& identity, std::weak_ptr<Account> const& account)
 
=== modified file 'src/qt/client/internal/local_client/RuntimeImpl.cpp'
--- src/qt/client/internal/local_client/RuntimeImpl.cpp	2016-07-12 02:22:05 +0000
+++ src/qt/client/internal/local_client/RuntimeImpl.cpp	2016-07-29 05:58:49 +0000
@@ -68,14 +68,19 @@
 
 void RuntimeImpl::shutdown()
 {
-    if (destroyed_.exchange(true))
+    if (destroyed_)
     {
         return;
     }
+    destroyed_ = true;
 }
 
 QFuture<QVector<Account::SPtr>> RuntimeImpl::accounts()
 {
+    if (destroyed_)
+    {
+        throw RuntimeDestroyedException("Runtime::accounts()");
+    }
 
     char const* user = g_get_user_name();
     assert(*user != '\0');
 
=== modified file 'src/qt/client/internal/local_client/UploaderImpl.cpp'
--- src/qt/client/internal/local_client/UploaderImpl.cpp	2016-07-26 01:51:26 +0000
+++ src/qt/client/internal/local_client/UploaderImpl.cpp	2016-07-29 05:58:49 +0000
@@ -93,8 +93,6 @@
     // Monitor read socket for ready-to-read, disconnected, and error events.
     connect(read_socket_.get(), &QLocalSocket::readyRead, this, &UploadWorker::on_bytes_ready);
     connect(read_socket_.get(), &QIODevice::readChannelFinished, this, &UploadWorker::on_read_channel_finished);
-    connect(read_socket_.get(), static_cast<void(QLocalSocket::*)(QLocalSocket::LocalSocketError)>(&QLocalSocket::error),
-            this, &UploadWorker::on_error);
 
     using namespace boost::filesystem;
 
@@ -114,10 +112,11 @@
         tmp_fd_.reset(mkstemp(const_cast<char*>(tmpfile.data())));
         if (tmp_fd_.get() == -1)
         {
+            int error_code = errno;
             worker_initialized_.reportFinished();
             QString msg = "cannot create temp file \"" + QString::fromStdString(tmpfile)
                           + "\": " + QString::fromStdString(storage::internal::safe_strerror(errno));
-            handle_error(msg);
+            handle_error(msg, error_code);
             return;
         }
         output_file_.reset(new QFile(QString::fromStdString(tmpfile)));
@@ -140,11 +139,6 @@
 
 void UploadWorker::do_finish()
 {
-    if (qf_.future().isFinished())
-    {
-        return;  // Future was set previously, no point in continuing.
-    }
-
     switch (state_)
     {
         case in_progress:
@@ -165,8 +159,10 @@
         }
         case error:
         {
-            make_exceptional_future(qf_, ResourceException(error_msg_));
+            // LCOV_EXCL_START
+            make_exceptional_future(qf_, ResourceException(error_msg_, error_code_));
             break;
+            // LCOV_EXCL_STOP
         }
         default:
         {
@@ -201,14 +197,14 @@
         auto bytes_written = output_file_->write(buf);
         if (bytes_written == -1)
         {
-            handle_error("socket error: " + output_file_->errorString());  // LCOV_EXCL_LINE
+            handle_error("socket error: " + output_file_->errorString(), output_file_->error());  // LCOV_EXCL_LINE
         }
         else if (bytes_written != buf.size())
         {
             // LCOV_EXCL_START
             QString msg = "write error, requested " + QString::number(buf.size()) + " B, but wrote only "
                           + bytes_written + " B.";
-            handle_error(msg);
+            handle_error(msg, 0);
             // LCOV_EXCL_STOP
         }
     }
@@ -220,11 +216,6 @@
     do_finish();
 }
 
-void UploadWorker::on_error()
-{
-    handle_error(read_socket_->errorString());
-}
-
 void UploadWorker::finalize()
 {
     auto file = file_.lock();
@@ -259,7 +250,7 @@
             state_ = error;
             QString msg = "Uploader::finish_upload(): cannot close tmp file: "
                           + QString::fromStdString(storage::internal::safe_strerror(errno));
-            make_exceptional_future(qf_, ResourceException(msg));
+            make_exceptional_future(qf_, ResourceException(msg, errno));
             return;
             // LCOV_EXCL_STOP
         }
@@ -273,7 +264,7 @@
         // LCOV_EXCL_START
         state_ = error;
         QString msg = "Uploader::finish_upload(): cannot flush output file: " + output_file_->errorString();
-        make_exceptional_future(qf_, ResourceException(msg));
+        make_exceptional_future(qf_, ResourceException(msg, output_file_->error()));
         return;
         // LCOV_EXCL_STOP
     }
@@ -287,11 +278,12 @@
         if (linkat(-1, old_path.c_str(), tmp_fd_.get(), new_path.c_str(), AT_SYMLINK_FOLLOW) == -1)
         {
             // LCOV_EXCL_START
+            int error_code = errno;
             state_ = error;
             QString msg = "Uploader::finish_upload(): linkat \"" + QString::fromStdString(old_path)
                           + "\" to \"" + file->native_identity() + "\" failed: "
                           + QString::fromStdString(storage::internal::safe_strerror(errno));
-            make_exceptional_future(qf_, ResourceException(msg));
+            make_exceptional_future(qf_, ResourceException(msg, error_code));
             return;
             // LCOV_EXCL_STOP
         }
@@ -302,11 +294,12 @@
         auto old_path = output_file_->fileName().toStdString();
         if (rename(old_path.c_str(), new_path.c_str()) == -1)
         {
+            int error_code = errno;
             state_ = error;
             QString msg = "Uploader::finish_upload(): rename \"" + QString::fromStdString(old_path)
                           + "\" to \"" + file->native_identity() + "\" failed: "
                           + QString::fromStdString(storage::internal::safe_strerror(errno));
-            make_exceptional_future(qf_, ResourceException(msg));
+            make_exceptional_future(qf_, ResourceException(msg, error_code));
             return;
         }
         // LCOV_EXCL_STOP
@@ -318,7 +311,8 @@
     make_ready_future(qf_, file);
 }
 
-void UploadWorker::handle_error(QString const& msg)
+// LCOV_EXCL_START
+void UploadWorker::handle_error(QString const& msg, int error_code)
 {
     if (state_ == in_progress)
     {
@@ -327,8 +321,10 @@
     }
     state_ = error;
     error_msg_ = "Uploader: " + msg;
+    error_code_ = error_code;
     do_finish();
 }
+// LCOV_EXCL_STOP
 
 UploadThread::UploadThread(UploadWorker* worker)
     : worker_(worker)
@@ -357,7 +353,7 @@
         // LCOV_EXCL_START
         QString msg = "Uploader: cannot create socket pair: "
                       + QString::fromStdString(storage::internal::safe_strerror(errno));
-        make_exceptional_future(qf_, ResourceException(msg));
+        make_exceptional_future(qf_, ResourceException(msg, errno));
         return;
         // LCOV_EXCL_STOP
     }
@@ -405,6 +401,7 @@
     if (write_socket_->state() == QLocalSocket::ConnectedState)
     {
         write_socket_->disconnectFromServer();
+        write_socket_->close();
     }
     return qf_.future();
 }
 
=== modified file 'src/qt/client/internal/remote_client/AccountImpl.cpp'
--- src/qt/client/internal/remote_client/AccountImpl.cpp	2016-07-27 02:19:17 +0000
+++ src/qt/client/internal/remote_client/AccountImpl.cpp	2016-07-29 05:58:49 +0000
@@ -65,16 +65,19 @@
 
 QString AccountImpl::owner() const
 {
+    runtime();  // Throws if runtime was destroyed.
     return owner_;
 }
 
 QString AccountImpl::owner_id() const
 {
+    runtime();  // Throws if runtime was destroyed.
     return owner_id_;
 }
 
 QString AccountImpl::description() const
 {
+    runtime();  // Throws if runtime was destroyed.
     return description_;
 }
 
@@ -84,6 +87,16 @@
 
     auto process_reply = [this](decltype(reply) const& reply, QFutureInterface<QVector<Root::SPtr>>& qf)
     {
+        try
+        {
+            this->runtime();
+        }
+        catch (RuntimeDestroyedException const& e)
+        {
+            make_exceptional_future(qf, RuntimeDestroyedException("Account::roots()"));
+            return;
+        }
+
         QVector<shared_ptr<Root>> roots;
         auto metadata = reply.value();
         for (auto const& md : metadata)
 
=== modified file 'src/qt/client/internal/remote_client/FileImpl.cpp'
--- src/qt/client/internal/remote_client/FileImpl.cpp	2016-07-22 01:45:39 +0000
+++ src/qt/client/internal/remote_client/FileImpl.cpp	2016-07-29 05:58:49 +0000
@@ -52,6 +52,10 @@
     {
         throw deleted_ex("File::size()");
     }
+    if (!get_root())
+    {
+        throw RuntimeDestroyedException("File::size()");
+    }
     return 0;  // TODO
 }
 
@@ -66,18 +70,19 @@
         QString msg = "File::create_uploader(): size must be >= 0";
         return make_exceptional_future<shared_ptr<Uploader>>(InvalidArgumentException(msg));
     }
+    if (!get_root())
+    {
+        return make_exceptional_future<shared_ptr<Uploader>>(RuntimeDestroyedException("File::create_uploader()"));
+    }
 
     QString old_etag = policy == ConflictPolicy::overwrite ? "" : md_.etag;
     auto prov = provider();
-    if (!prov)
-    {
-        return make_exceptional_future<shared_ptr<Uploader>>(RuntimeDestroyedException("File::create_uploader"));
-    }
     auto reply = prov->Update(md_.item_id, size, old_etag);
 
-    auto process_reply = [this, size, old_etag, prov](decltype(reply) const& reply, QFutureInterface<std::shared_ptr<Uploader>>& qf)
+    auto process_reply = [this, size, old_etag, prov](decltype(reply) const& reply,
+                                                      QFutureInterface<std::shared_ptr<Uploader>>& qf)
     {
-        auto root = root_.lock();
+        auto root = get_root();
         if (!root)
         {
             make_exceptional_future<shared_ptr<Uploader>>(RuntimeDestroyedException("File::create_uploader()"));
@@ -107,17 +112,24 @@
     {
         return make_exceptional_future<shared_ptr<Downloader>>(deleted_ex("File::create_downloader()"));
     }
+    if (!get_root())
+    {
+        return make_exceptional_future<shared_ptr<Downloader>>(RuntimeDestroyedException("File::create_downloader()"));
+    }
 
     auto prov = provider();
-    if (!prov)
-    {
-        return make_exceptional_future<shared_ptr<Downloader>>(RuntimeDestroyedException("File::create_downloader"));
-    }
     auto reply = prov->Download(md_.item_id);
 
     auto process_reply = [this, prov](QDBusPendingReply<QString, QDBusUnixFileDescriptor> const& reply,
                                       QFutureInterface<std::shared_ptr<Downloader>>& qf)
     {
+        auto root = get_root();
+        if (!root)
+        {
+            make_exceptional_future<shared_ptr<Uploader>>(RuntimeDestroyedException("File::create_downloader()"));
+            return;
+        }
+
         auto download_id = reply.argumentAt<0>();
         auto fd = reply.argumentAt<1>();
         if (fd.fileDescriptor() < 0)
 
=== modified file 'src/qt/client/internal/remote_client/FolderImpl.cpp'
--- src/qt/client/internal/remote_client/FolderImpl.cpp	2016-07-27 02:19:17 +0000
+++ src/qt/client/internal/remote_client/FolderImpl.cpp	2016-07-29 05:58:49 +0000
@@ -61,6 +61,10 @@
     {
         return make_exceptional_future<QVector<shared_ptr<Item>>>(deleted_ex("Folder::list()"));
     }
+    if (!get_root())
+    {
+        return make_exceptional_future<QVector<shared_ptr<Item>>>(RuntimeDestroyedException("Folder::list()"));
+    }
 
     auto prov = provider();
     if (!prov)
@@ -74,7 +78,7 @@
     function<void(decltype(reply) const&, QFutureInterface<QVector<shared_ptr<Item>>>&)> process_reply
         = [this, prov, &process_reply](decltype(reply) const& reply, QFutureInterface<QVector<shared_ptr<Item>>>& qf)
     {
-        auto root = root_.lock();
+        auto root = get_root();
         if (!root)
         {
             make_exceptional_future(qf, RuntimeDestroyedException("Folder::list()"));
@@ -117,17 +121,17 @@
     {
         return make_exceptional_future<QVector<shared_ptr<Item>>>(deleted_ex("Folder::lookup()"));
     }
-
-    auto prov = provider();
-    if (!prov)
+    if (!get_root())
     {
         return make_exceptional_future<QVector<shared_ptr<Item>>>(RuntimeDestroyedException("Folder::lookup()"));
     }
+
+    auto prov = provider();
     auto reply = prov->Lookup(md_.item_id, name);
 
     auto process_reply = [this, name](decltype(reply) const& reply, QFutureInterface<QVector<shared_ptr<Item>>>& qf)
     {
-        auto root = root_.lock();
+        auto root = get_root();
         if (!root)
         {
             make_exceptional_future(qf, RuntimeDestroyedException("Folder::lookup()"));
@@ -163,17 +167,17 @@
     {
         return make_exceptional_future<shared_ptr<Folder>>(deleted_ex("Folder::create_folder()"));
     }
-
-    auto prov = provider();
-    if (!prov)
+    if (!get_root())
     {
         return make_exceptional_future<shared_ptr<Folder>>(RuntimeDestroyedException("Folder::create_folder()"));
     }
+
+    auto prov = provider();
     auto reply = prov->CreateFolder(md_.item_id, name);
 
     auto process_reply = [this](decltype(reply) const& reply, QFutureInterface<shared_ptr<Folder>>& qf)
     {
-        auto root = root_.lock();
+        auto root = get_root();
         if (!root)
         {
             make_exceptional_future(qf, RuntimeDestroyedException("Folder::create_folder()"));
@@ -208,17 +212,17 @@
         QString msg = "Folder::create_file(): size must be >= 0";
         return make_exceptional_future<shared_ptr<Uploader>>(InvalidArgumentException(msg));
     }
-
-    auto prov = provider();
-    if (!prov)
+    if (!get_root())
     {
         return make_exceptional_future<shared_ptr<Uploader>>(RuntimeDestroyedException("Folder::create_file()"));
     }
 
+    auto prov = provider();
     auto reply = prov->CreateFile(md_.item_id, name, size, "application/octet-stream", false);
+
     auto process_reply = [this, size](decltype(reply) const& reply, QFutureInterface<shared_ptr<Uploader>>& qf)
     {
-        auto root = root_.lock();
+        auto root = get_root();
         if (!root)
         {
             make_exceptional_future(qf, RuntimeDestroyedException("Folder::create_file()"));
 
=== modified file 'src/qt/client/internal/remote_client/ItemImpl.cpp'
--- src/qt/client/internal/remote_client/ItemImpl.cpp	2016-07-27 02:19:17 +0000
+++ src/qt/client/internal/remote_client/ItemImpl.cpp	2016-07-29 05:58:49 +0000
@@ -54,6 +54,10 @@
     {
         throw deleted_ex("Item::name()");
     }
+    if (!get_root())
+    {
+        throw RuntimeDestroyedException("Item::name()");
+    }
     return md_.name;
 }
 
@@ -63,6 +67,10 @@
     {
         throw deleted_ex("Item::etag()");
     }
+    if (!get_root())
+    {
+        throw RuntimeDestroyedException("Item::etag()");
+    }
     return md_.etag;
 }
 
@@ -72,6 +80,10 @@
     {
         throw deleted_ex("Item::metadata()");
     }
+    if (!get_root())
+    {
+        throw RuntimeDestroyedException("Item::metadata()");
+    }
     // TODO: need to agree on metadata representation
     return QVariantMap();
 }
@@ -82,6 +94,10 @@
     {
         throw deleted_ex("Item::last_modified_time()");
     }
+    if (!get_root())
+    {
+        throw RuntimeDestroyedException("Item::last_modified_time()");
+    }
     // TODO: need to agree on metadata representation
     return QDateTime();
 }
@@ -92,17 +108,17 @@
     {
         return make_exceptional_future<shared_ptr<Item>>(deleted_ex("Item::copy()"));
     }
+    if (!get_root())
+    {
+        return make_exceptional_future<shared_ptr<Item>>(RuntimeDestroyedException("Item::copy()"));
+    }
 
     auto prov = provider();
-    if (!prov)
-    {
-        return make_exceptional_future<shared_ptr<Item>>(RuntimeDestroyedException("Item::copy()"));
-    }
     auto reply = prov->Copy(md_.item_id, new_parent->native_identity(), new_name);
 
     auto process_reply = [this](decltype(reply) const& reply, QFutureInterface<std::shared_ptr<Item>>& qf)
     {
-        auto root = root_.lock();
+        auto root = get_root();
         if (!root)
         {
             make_exceptional_future(qf, RuntimeDestroyedException("Item::copy()"));
@@ -132,6 +148,10 @@
     {
         return make_exceptional_future<shared_ptr<Item>>(deleted_ex("Item::move()"));
     }
+    if (!get_root())
+    {
+        return make_exceptional_future<shared_ptr<Item>>(RuntimeDestroyedException("Item::copy()"));
+    }
 
     auto prov = provider();
     if (!prov)
@@ -142,10 +162,10 @@
 
     auto process_reply = [this](decltype(reply) const& reply, QFutureInterface<std::shared_ptr<Item>>& qf)
     {
-        auto root = root_.lock();
+        auto root = get_root();
         if (!root)
         {
-            make_exceptional_future(qf, RuntimeDestroyedException("Item::copy()"));
+            make_exceptional_future(qf, RuntimeDestroyedException("Item::move()"));
             return;
         }
 
@@ -170,6 +190,10 @@
     {
         return make_exceptional_future<QVector<Folder::SPtr>>(deleted_ex("Item::parents()"));
     }
+    if (!get_root())
+    {
+        return make_exceptional_future<QVector<Folder::SPtr>>(RuntimeDestroyedException("Item::parents()"));
+    }
     // TODO, need different metadata representation, affects xml
     return QFuture<QVector<Folder::SPtr>>();
 }
@@ -180,6 +204,10 @@
     {
         throw deleted_ex("Item::parent_ids()");
     }
+    if (!get_root())
+    {
+        RuntimeDestroyedException("Item::parent_ids()");
+    }
     // TODO, need different metadata representation, affects xml
     return QVector<QString>();
 }
@@ -190,12 +218,12 @@
     {
         return make_exceptional_future(deleted_ex("Item::delete_item()"));
     }
+    if (!get_root())
+    {
+        return make_exceptional_future(RuntimeDestroyedException("Item::parents()"));
+    }
 
     auto prov = provider();
-    if (!prov)
-    {
-        return make_exceptional_future(RuntimeDestroyedException("Item::delete_item()"));
-    }
     auto reply = prov->Delete(md_.item_id);
 
     auto process_reply = [this](decltype(reply) const&, QFutureInterface<void>& qf)
 
=== modified file 'src/qt/client/internal/remote_client/RootImpl.cpp'
--- src/qt/client/internal/remote_client/RootImpl.cpp	2016-07-27 02:19:17 +0000
+++ src/qt/client/internal/remote_client/RootImpl.cpp	2016-07-29 05:58:49 +0000
@@ -50,45 +50,70 @@
 
 QFuture<QVector<Folder::SPtr>> RootImpl::parents() const
 {
+    if (!get_root())
+    {
+        return make_exceptional_future<QVector<Folder::SPtr>>(RuntimeDestroyedException("Root::parents()"));
+    }
     return make_ready_future(QVector<Folder::SPtr>());  // For the root, we return an empty vector.
 }
 
 QVector<QString> RootImpl::parent_ids() const
 {
+    if (!get_root())
+    {
+        return make_exceptional_future<QVector<QString>>(RuntimeDestroyedException("Root::parent_ids()"));
+    }
     return QVector<QString>();  // For the root, we return an empty vector.
 }
 
 QFuture<void> RootImpl::delete_item()
 {
+    if (!get_root())
+    {
+        return make_exceptional_future(RuntimeDestroyedException("Root::delete_item()"));
+    }
     // Cannot delete root.
     return make_exceptional_future(LogicException("Root::delete_item(): root item cannot be deleted"));
 }
 
 QFuture<int64_t> RootImpl::free_space_bytes() const
 {
+    if (!get_root())
+    {
+        return make_exceptional_future<int64_t>(RuntimeDestroyedException("Root::free_space_bytes()"));
+    }
     // TODO, need to refresh metadata here instead.
     return make_ready_future(int64_t(1));
 }
 
 QFuture<int64_t> RootImpl::used_space_bytes() const
 {
+    if (!get_root())
+    {
+        return make_exceptional_future<int64_t>(RuntimeDestroyedException("Root::used_space_bytes()"));
+    }
     // TODO, need to refresh metadata here instead.
     return make_ready_future(int64_t(1));
 }
 
 QFuture<Item::SPtr> RootImpl::get(QString native_identity) const
 {
+    if (!get_root())
+    {
+        return make_exceptional_future<Item::SPtr>(RuntimeDestroyedException("Root::get()"));
+    }
+
     auto prov = provider();
-    if (!prov)
-    {
-        return make_exceptional_future<Item::SPtr>(RuntimeDestroyedException("Root::get()"));
-    }
     auto reply = prov->Metadata(native_identity);
 
     auto process_reply = [this](decltype(reply) const& reply, QFutureInterface<Item::SPtr>& qf)
     {
-        auto account = account_.lock();
-        if (!account)
+        shared_ptr<Account> acc;
+        try
+        {
+            acc = account();
+        }
+        catch (RuntimeDestroyedException const&)
         {
             make_exceptional_future<Item::SPtr>(qf, RuntimeDestroyedException("Root::get()"));
             return;
@@ -98,11 +123,11 @@
         Item::SPtr item;
         if (md.type == ItemType::root)
         {
-            item = make_root(md, account);
+            item = make_root(md, acc);
         }
         else
         {
-            assert(root_.lock());  // Account owns the root, so it can't go away.
+            // acc owns the root, so the root weak_ptr is guaranteed to be lockable.
             item = ItemImpl::make_item(md, root_);
         }
         make_ready_future(qf, item);
 
=== modified file 'src/qt/client/internal/remote_client/RuntimeImpl.cpp'
--- src/qt/client/internal/remote_client/RuntimeImpl.cpp	2016-07-22 00:17:24 +0000
+++ src/qt/client/internal/remote_client/RuntimeImpl.cpp	2016-07-29 05:58:49 +0000
@@ -19,7 +19,6 @@
 #include <unity/storage/qt/client/internal/remote_client/RuntimeImpl.h>
 
 #include <unity/storage/qt/client/Account.h>
-#include <unity/storage/qt/client/Exceptions.h>
 #include <unity/storage/qt/client/internal/make_future.h>
 #include <unity/storage/qt/client/internal/remote_client/AccountImpl.h>
 #include <unity/storage/qt/client/internal/remote_client/dbusmarshal.h>
@@ -81,15 +80,21 @@
 
 void RuntimeImpl::shutdown()
 {
-    if (destroyed_.exchange(true))
+    if (destroyed_)
     {
         return;
     }
+    destroyed_ = true;
     conn_.disconnectFromBus(conn_.name());
 }
 
 QFuture<QVector<Account::SPtr>> RuntimeImpl::accounts()
 {
+    if (destroyed_)
+    {
+        return make_exceptional_future(qf_, RuntimeDestroyedException("Runtime::accounts()"));
+    }
+
     if (!manager_)
     {
         manager_.reset(new OnlineAccounts::Manager("", conn_));
@@ -110,6 +115,12 @@
 
 void RuntimeImpl::manager_ready()
 {
+    if (destroyed_)
+    {
+        make_exceptional_future(qf_, RuntimeDestroyedException("Runtime::accounts()"));
+        return;
+    }
+
     timer_.stop();
     try
     {
@@ -133,7 +144,7 @@
 
 void RuntimeImpl::timeout()
 {
-    make_exceptional_future(qf_, ResourceException("timeout error"));  // TODO
+    make_exceptional_future(qf_, ResourceException("Runtime::accounts(): timeout retrieving Online accounts", 0));
 }
 
 }  // namespace local_client
 
=== modified file 'src/qt/client/internal/remote_client/UploaderImpl.cpp'
--- src/qt/client/internal/remote_client/UploaderImpl.cpp	2016-07-22 01:45:39 +0000
+++ src/qt/client/internal/remote_client/UploaderImpl.cpp	2016-07-29 05:58:49 +0000
@@ -51,14 +51,14 @@
     , fd_(fd)
     , size_(size)
     , old_etag_(old_etag)
-    , root_(root)
+    , root_(root.lock())
     , provider_(provider)
     , write_socket_(new QLocalSocket)
 {
     assert(!upload_id.isEmpty());
     assert(fd.isValid());
     assert(size >= 0);
-    assert(root_.lock());
+    assert(root_);
     assert(provider);
     assert(fd.isValid());
     write_socket_->setSocketDescriptor(fd_.fileDescriptor(), QLocalSocket::ConnectedState, QIODevice::WriteOnly);
@@ -79,13 +79,6 @@
     auto reply = provider_->FinishUpload(upload_id_);
     auto process_reply = [this](decltype(reply) const& reply, QFutureInterface<shared_ptr<File>>& qf)
     {
-        auto root = root_.lock();
-        if (!root)
-        {
-            make_exceptional_future(qf, RuntimeDestroyedException("Uploader::finish_upload()"));
-            return;
-        }
-
         auto md = reply.value();
         if (md.type != ItemType::file)
         {
@@ -95,7 +88,7 @@
             make_exceptional_future(qf, LocalCommsException(msg));
             return;
         }
-        make_ready_future(qf, FileImpl::make_file(md, root));
+        make_ready_future(qf, FileImpl::make_file(md, root_));
     };
 
     auto handler = new Handler<shared_ptr<File>>(this, reply, process_reply);
 
=== modified file 'tests/local-client/local-client_test.cpp'
--- tests/local-client/local-client_test.cpp	2016-07-27 02:19:17 +0000
+++ tests/local-client/local-client_test.cpp	2016-07-29 05:58:49 +0000
@@ -18,7 +18,12 @@
 
 #include <unity/storage/qt/client/client-api.h>
 
+<<<<<<< TREE
 #include <unity/storage/qt/client/internal/local_client/boost_filesystem.h>
+=======
+#include <unity/storage/qt/client/internal/boost_filesystem.h>
+#include <unity/storage/qt/client/internal/local_client/tmpfile-prefix.h>
+>>>>>>> MERGE-SOURCE
 
 #include <gtest/gtest.h>
 #include <QCoreApplication>
@@ -34,6 +39,8 @@
 
 #include <fstream>
 
+Q_DECLARE_METATYPE(QLocalSocket::LocalSocketState)
+
 using namespace unity::storage;
 using namespace unity::storage::qt::client;
 using namespace std;
@@ -42,31 +49,61 @@
 
 // Bunch of helper function to reduce the amount of noise in the tests.
 
+template<typename T>
+void wait(T fut)
+{
+    QFutureWatcher<decltype(fut.result())> w;
+    QSignalSpy spy(&w, &decltype(w)::finished);
+    w.setFuture(fut);
+    ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
+}
+
+template<>
+void wait(QFuture<void> fut)
+{
+    QFutureWatcher<void> w;
+    QSignalSpy spy(&w, &decltype(w)::finished);
+    w.setFuture(fut);
+    ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
+}
+
+template <typename T>
+T call(QFuture<T> fut)
+{
+    wait(fut);
+    return fut.result();
+}
+
+template <>
+void call(QFuture<void> fut)
+{
+    wait(fut);
+    fut.waitForFinished();
+}
+
 Account::SPtr get_account(Runtime::SPtr const& runtime)
 {
-    auto accounts = runtime->accounts().result();
-    assert(accounts.size() == 1);
+    auto accounts = call(runtime->accounts());
     return accounts[0];
 }
 
 Root::SPtr get_root(Runtime::SPtr const& runtime)
 {
     auto acc = get_account(runtime);
-    auto roots = acc->roots().result();
-    assert(roots.size() == 1);
+    auto roots = call(acc->roots());
     return roots[0];
 }
 
 Folder::SPtr get_parent(Item::SPtr const& item)
 {
     assert(item->type() != ItemType::root);
-    auto parents = item->parents().result();
+    auto parents = call(item->parents());
     return parents[0];
 }
 
 void clear_folder(Folder::SPtr folder)
 {
-    auto items = folder->list().result();
+    auto items = call(folder->list());
     for (auto i : items)
     {
         i->delete_item().waitForFinished();
@@ -81,7 +118,7 @@
     return buf == expected;
 }
 
-void write_file(Folder::SPtr const& folder, QString const& name, QByteArray const& contents)
+File::SPtr write_file(Folder::SPtr const& folder, QString const& name, QByteArray const& contents)
 {
     QString ofile = folder->native_identity() + "/" + name;
     QFile f(ofile);
@@ -90,6 +127,23 @@
     {
         assert(f.write(contents));
     }
+    f.close();
+    auto items = call(folder->lookup(name));
+    return dynamic_pointer_cast<File>(items[0]);
+}
+
+File::SPtr make_deleted_file(Folder::SPtr parent, QString const& name)
+{
+    auto file = write_file(parent, name, "bytes");
+    call(file->delete_item());
+    return file;
+}
+
+Folder::SPtr make_deleted_folder(Folder::SPtr parent, QString const& name)
+{
+    auto folder = call(parent->create_folder(name));
+    call(folder->delete_item());
+    return folder;
 }
 
 TEST(Runtime, lifecycle)
@@ -104,7 +158,7 @@
     auto runtime = Runtime::create();
 
     auto acc = get_account(runtime);
-    EXPECT_EQ(runtime.get(), acc->runtime());
+    EXPECT_EQ(runtime, acc->runtime());
     auto owner = acc->owner();
     EXPECT_EQ(QString(g_get_user_name()), owner);
     auto owner_id = acc->owner_id();
@@ -118,11 +172,11 @@
     auto runtime = Runtime::create();
 
     auto acc = get_account(runtime);
-    auto roots = acc->roots().result();
+    auto roots = call(acc->roots());
     EXPECT_EQ(1, roots.size());
 
     // Get roots again, to get coverage for lazy initialization.
-    roots = acc->roots().result();
+    roots = call(acc->roots());
     ASSERT_EQ(1, roots.size());
 }
 
@@ -132,28 +186,36 @@
 
     auto acc = get_account(runtime);
     auto root = get_root(runtime);
-    EXPECT_EQ(acc.get(), root->account());
+    EXPECT_EQ(acc, root->account());
     EXPECT_EQ(ItemType::root, root->type());
     EXPECT_EQ("", root->name());
     EXPECT_NE("", root->etag());
 
-    auto parents = root->parents().result();
-    EXPECT_TRUE(parents.isEmpty());
-    EXPECT_TRUE(root->parent_ids().isEmpty());
+    {
+        auto parents = call(root->parents());
+        EXPECT_TRUE(parents.isEmpty());
+        EXPECT_TRUE(root->parent_ids().isEmpty());
+    }
 
-    // get(<root-path>) must return the root.
-    auto item = root->get(root->native_identity()).result();
-    EXPECT_NE(nullptr, dynamic_pointer_cast<Root>(item));
-    EXPECT_TRUE(root->equal_to(item));
+    {
+        // get(<root-path>) must return the root.
+        auto item = call(root->get(root->native_identity()));
+        EXPECT_NE(nullptr, dynamic_pointer_cast<Root>(item));
+        EXPECT_TRUE(root->equal_to(item));
+    }
 
     // Free and used space can be anything, but must be > 0.
-    auto free_space = root->free_space_bytes().result();
-    cerr << "bytes free: " << free_space << endl;
-    EXPECT_GT(free_space, 0);
+    {
+        auto free_space = call(root->free_space_bytes());
+        cerr << "bytes free: " << free_space << endl;
+        EXPECT_GT(free_space, 0);
+    }
 
-    auto used_space = root->used_space_bytes().result();
-    cerr << "bytes used: " << used_space << endl;
-    EXPECT_GT(used_space, 0);
+    {
+        auto used_space = call(root->used_space_bytes());
+        cerr << "bytes used: " << used_space << endl;
+        EXPECT_GT(used_space, 0);
+    }
 }
 
 TEST(Folder, basic)
@@ -164,31 +226,43 @@
     auto root = get_root(runtime);
     clear_folder(root);
 
-    auto items = root->list().result();
+    auto items = call(root->list());
     EXPECT_TRUE(items.isEmpty());
 
     // Create a file and check that it was created with correct type, name, and size 0.
-    auto uploader = root->create_file("file1", 0).result();
-    auto file = uploader->finish_upload().result();
+    auto uploader = call(root->create_file("file1", 0));
+    auto file = call(uploader->finish_upload());
     EXPECT_EQ(ItemType::file, file->type());
     EXPECT_EQ("file1", file->name());
     EXPECT_EQ(0, file->size());
     EXPECT_EQ(root->native_identity() + "/file1", file->native_identity());
 
     // Create a folder and check that it was created with correct type and name.
-    auto folder = root->create_folder("folder1").result();
+    auto folder = call(root->create_folder("folder1"));
     EXPECT_EQ(ItemType::folder, folder->type());
     EXPECT_EQ("folder1", folder->name());
     EXPECT_EQ(root->native_identity() + "/folder1", folder->native_identity());
 
     // Check that we can find both file1 and folder1.
-    auto item = root->lookup("file1").result()[0];
-    file = dynamic_pointer_cast<File>(item);
-    ASSERT_NE(nullptr, file);
-    EXPECT_EQ("file1", file->name());
-    EXPECT_EQ(0, file->size());
-
-    item = root->lookup("folder1").result()[0];
+    auto item = call(root->lookup("file1"))[0];
+    file = dynamic_pointer_cast<File>(item);
+    ASSERT_NE(nullptr, file);
+    EXPECT_EQ("file1", file->name());
+    EXPECT_EQ(0, file->size());
+
+    item = call(root->lookup("folder1"))[0];
+    folder = dynamic_pointer_cast<Folder>(item);
+    ASSERT_NE(nullptr, folder);
+    ASSERT_EQ(nullptr, dynamic_pointer_cast<Root>(folder));
+    EXPECT_EQ("folder1", folder->name());
+
+    item = call(root->get(file->native_identity()));
+    file = dynamic_pointer_cast<File>(item);
+    ASSERT_NE(nullptr, file);
+    EXPECT_EQ("file1", file->name());
+    EXPECT_EQ(0, file->size());
+
+    item = call(root->get(folder->native_identity()));
     folder = dynamic_pointer_cast<Folder>(item);
     ASSERT_NE(nullptr, folder);
     ASSERT_EQ(nullptr, dynamic_pointer_cast<Root>(folder));
@@ -224,8 +298,8 @@
     EXPECT_EQ(root->native_identity(), folder->parent_ids()[0]);
 
     // Delete the file and check that only the directory is left.
-    file->delete_item().waitForFinished();
-    items = root->list().result();
+    call(file->delete_item());
+    items = call(root->list());
     ASSERT_EQ(1, items.size());
     folder = dynamic_pointer_cast<Folder>(items[0]);
     ASSERT_NE(nullptr, folder);
@@ -233,7 +307,7 @@
 
     // Delete the folder and check that the root is empty.
     folder->delete_item().waitForFinished();
-    items = root->list().result();
+    items = call(root->list());
     ASSERT_EQ(0, items.size());
 }
 
@@ -245,8 +319,8 @@
     auto root = get_root(runtime);
     clear_folder(root);
 
-    auto d1 = root->create_folder("d1").result();
-    auto d2 = d1->create_folder("d2").result();
+    auto d1 = call(root->create_folder("d1"));
+    auto d2 = call(d1->create_folder("d2"));
 
     // Parent of d2 must be d1.
     EXPECT_TRUE(get_parent(d2)->equal_to(d1));
@@ -254,7 +328,7 @@
 
     // Delete is recursive
     d1->delete_item().waitForFinished();
-    auto items = root->list().result();
+    auto items = call(root->list());
     ASSERT_EQ(0, items.size());
 }
 
@@ -269,91 +343,73 @@
     {
         // Upload a few bytes.
         QByteArray const contents = "Hello\n";
-        auto uploader = root->create_file("new_file", contents.size()).result();
+        auto uploader = call(root->create_file("new_file", contents.size()));
         auto written = uploader->socket()->write(contents);
         ASSERT_EQ(contents.size(), written);
 
-        auto file_fut = uploader->finish_upload();
-        QFutureWatcher<File::SPtr> w;
-        QSignalSpy spy(&w, &decltype(w)::finished);
-        w.setFuture(file_fut);
-        ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
-
-        auto file = file_fut.result();
+        auto file = call(uploader->finish_upload());
         EXPECT_EQ(contents.size(), file->size());
         ASSERT_TRUE(content_matches(file, contents));
 
         // Calling finish_upload() more than once must return the original future.
-        auto file2 = uploader->finish_upload().result();
+        auto file2 = call(uploader->finish_upload());
         EXPECT_TRUE(file2->equal_to(file));
 
         // Calling cancel() after finish_upload must do nothing.
         uploader->cancel();
-        file2 = uploader->finish_upload().result();
+        file2 = call(uploader->finish_upload());
         EXPECT_TRUE(file2->equal_to(file));
 
-        file->delete_item().waitForFinished();
+        call(file->delete_item());
     }
 
     {
         // Upload exactly 64 KB.
         QByteArray const contents(64 * 1024, 'a');
-        auto uploader = root->create_file("new_file", contents.size()).result();
+        auto uploader = call(root->create_file("new_file", contents.size()));
         auto written = uploader->socket()->write(contents);
         ASSERT_EQ(contents.size(), written);
 
-        auto file_fut = uploader->finish_upload();
-        QFutureWatcher<File::SPtr> w;
-        QSignalSpy spy(&w, &decltype(w)::finished);
-        w.setFuture(file_fut);
-        ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
-
-        auto file = file_fut.result();
+        auto file = call(uploader->finish_upload());
         EXPECT_EQ(contents.size(), file->size());
         ASSERT_TRUE(content_matches(file, contents));
 
-        file->delete_item().waitForFinished();
+        call(file->delete_item());
     }
 
     {
         // Upload 1000 KBj
         QByteArray const contents(1000 * 1024, 'a');
-        auto uploader = root->create_file("new_file", contents.size()).result();
+        auto uploader = call(root->create_file("new_file", contents.size()));
         auto written = uploader->socket()->write(contents);
         ASSERT_EQ(contents.size(), written);
 
-        auto file_fut = uploader->finish_upload();
-        QFutureWatcher<File::SPtr> w;
-        QSignalSpy spy(&w, &decltype(w)::finished);
-        w.setFuture(file_fut);
-        ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
-
-        auto file = file_fut.result();
+        auto file = call(uploader->finish_upload());
         EXPECT_EQ(contents.size(), file->size());
         ASSERT_TRUE(content_matches(file, contents));
 
-        file->delete_item().waitForFinished();
+        call(file->delete_item());
     }
 
     {
         // Upload empty file.
-        auto uploader = root->create_file("new_file", 0).result();
-        auto file = uploader->finish_upload().result();
+        auto uploader = call(root->create_file("new_file", 0));
+        auto file = call(uploader->finish_upload());
         ASSERT_EQ(0, file->size());
 
         // Again, and check that the ETag is different.
         auto old_etag = file->etag();
         sleep(1);
-        uploader = file->create_uploader(ConflictPolicy::overwrite, 0).result();
-        file = uploader->finish_upload().result();
+        uploader = call(file->create_uploader(ConflictPolicy::overwrite, 0));
+        file = call(uploader->finish_upload());
         EXPECT_NE(old_etag, file->etag());
 
-        file->delete_item().waitForFinished();
+        call(file->delete_item());
     }
 
     {
         // Let the uploader go out of scope and check that the file was not created.
-        root->create_file("new_file", 0).result();
+        call(root->create_file("new_file", 0));
         boost::filesystem::path path(TEST_DIR "/storage-framework/new_file");
         auto status = boost::filesystem::status(path);
         ASSERT_FALSE(boost::filesystem::exists(status));
@@ -369,47 +425,25 @@
     clear_folder(root);
 
     // Make a new file first.
-    auto uploader = root->create_file("new_file", 0).result();
-    auto file_fut = uploader->finish_upload();
-    {
-        QFutureWatcher<File::SPtr> w;
-        QSignalSpy spy(&w, &decltype(w)::finished);
-        w.setFuture(file_fut);
-        ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
-    }
-    auto file = file_fut.result();
+    auto uploader = call(root->create_file("new_file", 0));
+    auto file = call(uploader->finish_upload());
     EXPECT_EQ(0, file->size());
     auto old_etag = file->etag();
 
     // Create uploader for the file and write nothing.
-    uploader = file->create_uploader(ConflictPolicy::overwrite, 0).result();
-    file_fut = uploader->finish_upload();
-    {
-        QFutureWatcher<File::SPtr> w;
-        QSignalSpy spy(&w, &decltype(w)::finished);
-        w.setFuture(file_fut);
-        ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
-    }
-    file = file_fut.result();
+    uploader = call(file->create_uploader(ConflictPolicy::overwrite, 0));
+    file = call(uploader->finish_upload());
     EXPECT_EQ(0, file->size());
 
     // Same test again, but this time, we write a bunch of data.
     std::string s(1000000, 'a');
-    uploader = file->create_uploader(ConflictPolicy::overwrite, s.size()).result();
+    uploader = call(file->create_uploader(ConflictPolicy::overwrite, s.size()));
     uploader->socket()->write(&s[0], s.size());
 
     // Need to sleep here, otherwise it is possible for the
     // upload to finish within the granularity of the file system time stamps.
     sleep(1);
-    file_fut = uploader->finish_upload();
-    {
-        QFutureWatcher<File::SPtr> w;
-        QSignalSpy spy(&w, &decltype(w)::finished);
-        w.setFuture(file_fut);
-        // Now that we have disconnected, the future must become ready.
-        ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
-    }
-    file = file_fut.result();
+    file = call(uploader->finish_upload());
     EXPECT_EQ(1000000, file->size());
     EXPECT_NE(old_etag, file->etag());
 
@@ -425,12 +459,12 @@
     clear_folder(root);
 
     {
-        auto uploader = root->create_file("new_file", 20).result();
+        auto uploader = call(root->create_file("new_file", 20));
 
         // We haven't called finish_upload(), so the cancel is guaranteed
         // to catch the uploader in the in_progress state.
         uploader->cancel();
-        EXPECT_THROW(uploader->finish_upload().result(), CancelledException);
+        EXPECT_THROW(call(uploader->finish_upload()), CancelledException);
 
         boost::filesystem::path path(TEST_DIR "/storage-framework/new_file");
         auto status = boost::filesystem::status(path);
@@ -440,33 +474,25 @@
     {
         // Create a file with a few bytes.
         QByteArray original_contents = "Hello World!\n";
-        write_file(root, "new_file", original_contents);
-        auto file = dynamic_pointer_cast<File>(root->lookup("new_file").result()[0]);
-        ASSERT_NE(nullptr, file);
+        auto file = write_file(root, "new_file", original_contents);
 
         // Create an uploader for the file and write a bunch of bytes.
-        auto uploader = file->create_uploader(ConflictPolicy::overwrite, original_contents.size()).result();
+        auto uploader = call(file->create_uploader(ConflictPolicy::overwrite, original_contents.size()));
         QByteArray const contents(1024 * 1024, 'a');
         auto written = uploader->socket()->write(contents);
         ASSERT_EQ(contents.size(), written);
 
         // No finish_upload() here, so the transfer is still in progress. Now cancel.
-        auto cancel_fut = uploader->cancel();
-        {
-            QFutureWatcher<void> w;
-            QSignalSpy spy(&w, &decltype(w)::finished);
-            w.setFuture(cancel_fut);
-            ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
-        }
+        uploader->cancel();
 
         // finish_upload() must indicate that the upload was cancelled.
-        EXPECT_THROW(uploader->finish_upload().result(), CancelledException);
+        EXPECT_THROW(call(uploader->finish_upload()), CancelledException);
 
         // The original file contents must still be intact.
         EXPECT_EQ(original_contents.size(), file->size());
         ASSERT_TRUE(content_matches(file, original_contents));
 
-        file->delete_item().waitForFinished();
+        call(file->delete_item());
     }
 }
 
@@ -480,10 +506,8 @@
 
     // Make a new file on disk.
     QByteArray const contents = "";
-    write_file(root, "new_file", contents);
-    auto file = dynamic_pointer_cast<File>(root->lookup("new_file").result()[0]);
-    ASSERT_NE(nullptr, file);
-    auto uploader = file->create_uploader(ConflictPolicy::error_if_conflict, contents.size()).result();
+    auto file = write_file(root, "new_file", contents);
+    auto uploader = call(file->create_uploader(ConflictPolicy::error_if_conflict, contents.size()));
 
     // Touch the file on disk to give it a new time stamp.
     sleep(1);
@@ -492,7 +516,7 @@
     try
     {
         // Must get an exception because the time stamps no longer match.
-        uploader->finish_upload().result();
+        call(uploader->finish_upload());
         FAIL();
     }
     catch (ConflictException const&)
@@ -500,7 +524,52 @@
         // TODO: check exception details.
     }
 
-    file->delete_item().waitForFinished();
+    call(file->delete_item());
+}
+
+TEST(File, upload_error)
+{
+    auto runtime = Runtime::create();
+
+    auto acc = get_account(runtime);
+    auto root = get_root(runtime);
+    clear_folder(root);
+
+    auto uploader = call(root->create_file("new_file", 0));
+    // Make new_file, so it gets in the way during finish_upload().
+    write_file(root, "new_file", "");
+
+    try
+    {
+        call(uploader->finish_upload());
+        FAIL();
+    }
+    catch (ExistsException const& e)
+    {
+        EXPECT_TRUE(e.error_message().startsWith("Uploader::finish_upload(): item with name \""));
+        EXPECT_TRUE(e.error_message().endsWith("\" exists already"));
+        EXPECT_EQ(TEST_DIR "/storage-framework/new_file", e.native_identity()) << e.native_identity().toStdString();
+        EXPECT_EQ("new_file", e.name());
+    }
+}
+
+TEST(File, create_uploader_bad_arg)
+{
+    auto runtime = Runtime::create();
+
+    auto acc = get_account(runtime);
+    auto root = get_root(runtime);
+    clear_folder(root);
+
+    auto file = write_file(root, "new_file", 0);
+    try
+    {
+        call(file->create_uploader(ConflictPolicy::overwrite, -1));
+    }
+    catch (InvalidArgumentException const& e)
+    {
+        EXPECT_EQ("File::create_uploader(): size must be >= 0", e.error_message());
+    }
 }
 
 TEST(File, download)
@@ -514,22 +583,15 @@
     {
         // Download a few bytes.
         QByteArray const contents = "Hello\n";
-        write_file(root, "file", contents);
-
-        auto item = root->lookup("file").result()[0];
-        File::SPtr file = dynamic_pointer_cast<File>(item);
-        ASSERT_FALSE(file == nullptr);
-
-        auto downloader = file->create_downloader().result();
+        auto file = write_file(root, "file", contents);
+
+        auto downloader = call(file->create_downloader());
         EXPECT_TRUE(file->equal_to(downloader->file()));
 
         auto socket = downloader->socket();
         QByteArray buf;
         do
         {
-            // Need to pump the event loop while the socket does its thing.
-            QSignalSpy spy(downloader->socket().get(), &QIODevice::readyRead);
-            ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
             auto bytes_to_read = socket->bytesAvailable();
             buf.append(socket->read(bytes_to_read));
         } while (buf.size() < contents.size());
@@ -538,7 +600,7 @@
         QSignalSpy spy(downloader->socket().get(), &QLocalSocket::disconnected);
         ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
 
-        ASSERT_NO_THROW(downloader->finish_download().waitForFinished());
+        ASSERT_NO_THROW(call(downloader->finish_download()));
 
         // Contents must match.
         EXPECT_EQ(contents, buf);
@@ -547,13 +609,9 @@
     {
         // Download exactly 64 KB.
         QByteArray const contents(64 * 1024, 'a');
-        write_file(root, "file", contents);
-
-        auto item = root->lookup("file").result()[0];
-        File::SPtr file = dynamic_pointer_cast<File>(item);
-        ASSERT_FALSE(file == nullptr);
-
-        auto downloader = file->create_downloader().result();
+        auto file = write_file(root, "file", contents);
+
+        auto downloader = call(file->create_downloader());
         EXPECT_TRUE(file->equal_to(downloader->file()));
 
         auto socket = downloader->socket();
@@ -561,9 +619,12 @@
         do
         {
             // Need to pump the event loop while the socket does its thing.
-            QSignalSpy spy(downloader->socket().get(), &QIODevice::readyRead);
-            ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
             auto bytes_to_read = socket->bytesAvailable();
+            if (bytes_to_read == 0)
+            {
+                QSignalSpy spy(downloader->socket().get(), &QIODevice::readyRead);
+                ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
+            }
             buf.append(socket->read(bytes_to_read));
         } while (buf.size() < contents.size());
 
@@ -571,7 +632,7 @@
         QSignalSpy spy(downloader->socket().get(), &QLocalSocket::disconnected);
         ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
 
-        ASSERT_NO_THROW(downloader->finish_download().waitForFinished());
+        ASSERT_NO_THROW(call(downloader->finish_download()));
 
         // Contents must match
         EXPECT_EQ(contents, buf);
@@ -580,13 +641,9 @@
     {
         // Download 1 MB + 1 bytes.
         QByteArray const contents(1024 * 1024 + 1, 'a');
-        write_file(root, "file", contents);
-
-        auto item = root->lookup("file").result()[0];
-        File::SPtr file = dynamic_pointer_cast<File>(item);
-        ASSERT_FALSE(file == nullptr);
-
-        auto downloader = file->create_downloader().result();
+        auto file = write_file(root, "file", contents);
+
+        auto downloader = call(file->create_downloader());
         EXPECT_TRUE(file->equal_to(downloader->file()));
 
         auto socket = downloader->socket();
@@ -594,17 +651,20 @@
         do
         {
             // Need to pump the event loop while the socket does its thing.
-            QSignalSpy spy(downloader->socket().get(), &QIODevice::readyRead);
-            ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
             auto bytes_to_read = socket->bytesAvailable();
+            if (bytes_to_read == 0)
+            {
+                QSignalSpy spy(downloader->socket().get(), &QIODevice::readyRead);
+                ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
+            }
             buf.append(socket->read(bytes_to_read));
         } while (buf.size() < contents.size());
 
         // Wait for disconnected signal.
-        QSignalSpy spy(downloader->socket().get(), &QLocalSocket::disconnected);
+        QSignalSpy spy(socket.get(), &QLocalSocket::disconnected);
         ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
 
-        ASSERT_NO_THROW(downloader->finish_download().waitForFinished());
+        ASSERT_NO_THROW(call(downloader->finish_download()));
 
         // Contents must match
         EXPECT_EQ(contents, buf);
@@ -613,85 +673,84 @@
     {
         // Download file containing zero bytes
         QByteArray const contents;
-        write_file(root, "file", contents);
-
-        auto item = root->lookup("file").result()[0];
-        File::SPtr file = dynamic_pointer_cast<File>(item);
-        ASSERT_FALSE(file == nullptr);
-
-        auto downloader = file->create_downloader().result();
+        auto file = write_file(root, "file", contents);
+
+        auto downloader = call(file->create_downloader());
         EXPECT_TRUE(file->equal_to(downloader->file()));
 
         auto socket = downloader->socket();
 
-        // No readyRead every arrives in this case, just wait for disconnected.
-        QSignalSpy spy(downloader->socket().get(), &QLocalSocket::disconnected);
-        ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
+        // No readyRead ever arrives in this case, just wait for disconnected.
+        if (socket->state() != QLocalSocket::UnconnectedState)
+        {
+            QSignalSpy spy(socket.get(), &QLocalSocket::disconnected);
+            ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
+        }
 
-        ASSERT_NO_THROW(downloader->finish_download().waitForFinished());
+        ASSERT_NO_THROW(call(downloader->finish_download()));
     }
 
     {
         // Don't ever call read on empty file.
         QByteArray const contents;
-        write_file(root, "file", contents);
-
-        auto item = root->lookup("file").result()[0];
-        File::SPtr file = dynamic_pointer_cast<File>(item);
-        ASSERT_FALSE(file == nullptr);
-
-        auto downloader = file->create_downloader().result();
+        auto file = write_file(root, "file", contents);
+
+        auto downloader = call(file->create_downloader());
         EXPECT_TRUE(file->equal_to(downloader->file()));
 
+        auto socket = downloader->socket();
+
         // No readyRead ever arrives in this case, just wait for disconnected.
-        QSignalSpy spy(downloader->socket().get(), &QLocalSocket::disconnected);
-        ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
+        if (socket->state() != QLocalSocket::UnconnectedState)
+        {
+            QSignalSpy spy(socket.get(), &QLocalSocket::disconnected);
+            ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
+        }
 
         // This succeeds because the provider disconnects as soon
         // as it realizes that there is nothing to write.
-        ASSERT_NO_THROW(downloader->finish_download().waitForFinished());
+        ASSERT_NO_THROW(call(downloader->finish_download()));
     }
 
     {
         // Don't ever call read on small file.
         QByteArray const contents("some contents");
-        write_file(root, "file", contents);
-
-        auto item = root->lookup("file").result()[0];
-        File::SPtr file = dynamic_pointer_cast<File>(item);
-        ASSERT_FALSE(file == nullptr);
-
-        auto downloader = file->create_downloader().result();
+        auto file = write_file(root, "file", contents);
+
+        auto downloader = call(file->create_downloader());
         EXPECT_TRUE(file->equal_to(downloader->file()));
 
+        auto socket = downloader->socket();
+
         // Wait for disconnected.
-        QSignalSpy spy(downloader->socket().get(), &QLocalSocket::disconnected);
-        ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
+        if (socket->state() != QLocalSocket::UnconnectedState)
+        {
+            QSignalSpy spy(socket.get(), &QLocalSocket::disconnected);
+            ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
+        }
 
         // This succeeds because the provider has written everything and disconnected.
-        ASSERT_NO_THROW(downloader->finish_download().waitForFinished());
+        ASSERT_NO_THROW(call(downloader->finish_download()));
     }
 
     {
         // Don't ever call read on large file.
         QByteArray const contents(1024 * 1024, 'a');
-        write_file(root, "file", contents);
-
-        auto item = root->lookup("file").result()[0];
-        File::SPtr file = dynamic_pointer_cast<File>(item);
-        ASSERT_FALSE(file == nullptr);
-
-        auto downloader = file->create_downloader().result();
+        auto file = write_file(root, "file", contents);
+
+        auto downloader = call(file->create_downloader());
         EXPECT_TRUE(file->equal_to(downloader->file()));
 
+        auto socket = downloader->socket();
+
         // Wait for first readyRead. Not all data fits into the socket buffer.
-        QSignalSpy spy(downloader->socket().get(), &QLocalSocket::readyRead);
+        QSignalSpy spy(socket.get(), &QLocalSocket::readyRead);
         ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
 
         // This fails because the provider still has data left to write.
         try
         {
-            downloader->finish_download().waitForFinished();
+            call(downloader->finish_download());
             FAIL();
         }
         catch (StorageException const& e)
@@ -703,25 +762,17 @@
     {
         // Let downloader go out of scope.
         QByteArray const contents(1024 * 1024, 'a');
-        write_file(root, "file", contents);
-
-        auto item = root->lookup("file").result()[0];
-        File::SPtr file = dynamic_pointer_cast<File>(item);
-        ASSERT_FALSE(file == nullptr);
-
-        auto downloader = file->create_downloader().result();
+        auto file = write_file(root, "file", contents);
+
+        auto downloader = call(file->create_downloader());
     }
 
     {
         // Let downloader future go out of scope.
         QByteArray const contents(1024 * 1024, 'a');
-        write_file(root, "file", contents);
-
-        auto item = root->lookup("file").result()[0];
-        File::SPtr file = dynamic_pointer_cast<File>(item);
-        ASSERT_FALSE(file == nullptr);
-
-        auto downloader_fut = file->create_downloader();
+        auto file = write_file(root, "file", contents);
+
+        file->create_downloader();
     }
 }
 
@@ -736,65 +787,111 @@
     {
         // Download enough bytes to prevent a single write in the provider from completing the download.
         QByteArray const contents(1024 * 1024, 'a');
-        write_file(root, "file", contents);
-
-        auto item = root->lookup("file").result()[0];
-        File::SPtr file = dynamic_pointer_cast<File>(item);
-        ASSERT_FALSE(file == nullptr);
-
-        auto download_fut = file->create_downloader();
-        {
-            QFutureWatcher<Downloader::SPtr> w;
-            QSignalSpy spy(&w, &decltype(w)::finished);
-            w.setFuture(download_fut);
-            ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
-        }
-        auto downloader = download_fut.result();
+        auto file = write_file(root, "file", contents);
+
+        auto downloader = call(file->create_downloader());
 
         // We haven't read anything, so the cancel is guaranteed to catch the
         // downloader in the in_progress state.
-        auto cancel_fut = downloader->cancel();
-        {
-            QFutureWatcher<void> w;
-            QSignalSpy spy(&w, &decltype(w)::finished);
-            w.setFuture(cancel_fut);
-            ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
-        }
-        ASSERT_THROW(downloader->finish_download().waitForFinished(), CancelledException);
+        downloader->cancel();
+        ASSERT_THROW(call(downloader->finish_download()), CancelledException);
     }
 
     {
         // Download a few bytes.
         QByteArray const contents = "Hello\n";
-        write_file(root, "file", contents);
-
-        auto item = root->lookup("file").result()[0];
-        File::SPtr file = dynamic_pointer_cast<File>(item);
-        ASSERT_FALSE(file == nullptr);
+        auto file = write_file(root, "file", contents);
 
         // Finish the download.
-        auto downloader = file->create_downloader().result();
+        auto downloader = call(file->create_downloader());
         auto socket = downloader->socket();
         QByteArray buf;
         do
         {
             // Need to pump the event loop while the socket does its thing.
-            QSignalSpy spy(downloader->socket().get(), &QIODevice::readyRead);
-            ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
             auto bytes_to_read = socket->bytesAvailable();
+            if (bytes_to_read == 0)
+            {
+                QSignalSpy spy(downloader->socket().get(), &QIODevice::readyRead);
+                ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
+            }
             buf.append(socket->read(bytes_to_read));
         } while (buf.size() < contents.size());
 
         // Wait for disconnected signal.
-        QSignalSpy spy(downloader->socket().get(), &QLocalSocket::disconnected);
-        ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
+        if (socket->state() != QLocalSocket::UnconnectedState)
+        {
+            QSignalSpy spy(socket.get(), &QLocalSocket::disconnected);
+            ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
+        }
 
         // Now send the cancel. The download is finished already, and the cancel
         // is too late, so finish_download() must report that the download
         // worked OK.
         downloader->cancel();
-        ASSERT_NO_THROW(downloader->finish_download().waitForFinished());
-    }
+        ASSERT_NO_THROW(call(downloader->finish_download()));
+    }
+}
+
+TEST(File, download_error)
+{
+    auto runtime = Runtime::create();
+
+    auto acc = get_account(runtime);
+    auto root = get_root(runtime);
+    clear_folder(root);
+
+    QByteArray const contents(1024 * 1024, 'a');
+    auto file = write_file(root, "file", contents);
+
+    auto downloader = call(file->create_downloader());
+    EXPECT_TRUE(file->equal_to(downloader->file()));
+
+    auto socket = downloader->socket();
+
+    {
+        // Wait for first readyRead. Not all data fits into the socket buffer.
+        QSignalSpy spy(socket.get(), &QLocalSocket::readyRead);
+        ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
+    }
+
+    {
+        // Now close the socket, to force an error at the writing end.
+        // This gives us coverage of the error handling logic in the download worker.
+        socket->abort();
+        // Wait a little, to give the worker a chance to notice the problem.
+        // We don't wait for a signal here because all attempts to disable the
+        // socket (via close(), abort(), or disconnectFromServer() also
+        // stop the stateChanged signal from arriving.
+        QTimer timer;
+        QSignalSpy spy(&timer, &QTimer::timeout);
+        timer.start(1000);
+        spy.wait();
+    }
+
+    try
+    {
+        call(downloader->finish_download());
+        FAIL();
+    }
+    catch (ResourceException const& e)
+    {
+        EXPECT_TRUE(e.error_message().startsWith("Downloader: QLocalSocket: "));
+    }
+}
+
+TEST(File, size_error)
+{
+    auto runtime = Runtime::create();
+
+    auto acc = get_account(runtime);
+    auto root = get_root(runtime);
+    clear_folder(root);
+
+    auto file = write_file(root, "file", "");
+
+    ASSERT_EQ(0, system("rm " TEST_DIR "/storage-framework/file"));
+    EXPECT_THROW(file->size(), ResourceException);
 }
 
 TEST(Item, move)
@@ -807,25 +904,22 @@
 
     // Check that rename works within the same folder.
     QByteArray const contents = "Hello\n";
-    write_file(root, "f1", contents);
-    auto f1 = root->lookup("f1").result()[0];
-    auto f2 = f1->move(root, "f2").result();
-    EXPECT_EQ("f2", f2->name());
-    EXPECT_THROW(f1->name(), DeletedException);  // TODO: check exception details.
+    auto f1 = write_file(root, "f1", contents);
+    auto f2 = call(f1->move(root, "f2"));
 
     // File must be found under new name.
-    auto items = root->list().result();
+    auto items = call(root->list());
     ASSERT_EQ(1, items.size());
     f2 = dynamic_pointer_cast<File>(items[0]);
     ASSERT_FALSE(f2 == nullptr);
 
     // Make a folder and move f2 into it.
-    auto folder = root->create_folder("folder").result();
-    f2 = f2->move(folder, "f2").result();
+    auto folder = call(root->create_folder("folder"));
+    f2 = call(f2->move(folder, "f2"));
     EXPECT_TRUE(get_parent(f2)->equal_to(folder));
 
     // Move the folder
-    auto item = folder->move(root, "folder2").result();
+    auto item = call(folder->move(root, "folder2"));
     folder = dynamic_pointer_cast<Folder>(item);
     EXPECT_EQ("folder2", folder->name());
 }
@@ -839,10 +933,8 @@
     clear_folder(root);
 
     QByteArray const contents = "hello\n";
-    write_file(root, "file", contents);
-
-    auto item = root->lookup("file").result()[0];
-    auto copied_item = item->copy(root, "copy_of_file").result();
+    auto item = write_file(root, "file", contents);
+    auto copied_item = call(item->copy(root, "copy_of_file"));
     EXPECT_EQ("copy_of_file", copied_item->name());
     File::SPtr copied_file = dynamic_pointer_cast<File>(item);
     ASSERT_NE(nullptr, copied_file);
@@ -862,7 +954,9 @@
     // folder/empty_folder
     // folder/non_empty_folder
     // folder/non_empty_folder/nested_file
+    // folder/non_empty_folder/<TMPFILE_PREFIX>1234-1234-1234-1234
     // folder/file
+    // folder/<TMPFILE_PREFIX>1234-1234-1234-1234
 
     string root_path = root->native_identity().toStdString();
     ASSERT_EQ(0, mkdir((root_path + "/folder").c_str(), 0700));
@@ -871,23 +965,26 @@
     ofstream(root_path + "/folder/non_empty_folder/nested_file");
     ofstream(root_path + "/folder/file");
 
+    // Add dirs that look like a tmp dirs, to get coverage on skipping those.
+    ASSERT_EQ(0, mkdir((root_path + "/folder/" + TMPFILE_PREFIX "1234-1234-1234-1234").c_str(), 0700));
+    ASSERT_EQ(0, mkdir((root_path + "/folder/non_empty_folder/" + TMPFILE_PREFIX "1234-1234-1234-1234").c_str(), 0700));
     // Copy folder to folder2
-    auto folder = dynamic_pointer_cast<Folder>(root->lookup("folder").result()[0]);
+    auto folder = dynamic_pointer_cast<Folder>(call(root->lookup("folder"))[0]);
     ASSERT_NE(nullptr, folder);
-    auto item = folder->copy(root, "folder2").result();
+    auto item = call(folder->copy(root, "folder2"));
 
     // Verify that folder2 now contains the same structure as folder.
     auto folder2 = dynamic_pointer_cast<Folder>(item);
     ASSERT_NE(nullptr, folder2);
-    EXPECT_NO_THROW(folder2->lookup("empty_folder").result()[0]);
-    item = folder2->lookup("non_empty_folder").result()[0];
+    EXPECT_NO_THROW(call(folder2->lookup("empty_folder"))[0]);
+    item = call(folder2->lookup("non_empty_folder"))[0];
     auto non_empty_folder = dynamic_pointer_cast<Folder>(item);
     ASSERT_NE(nullptr, non_empty_folder);
-    EXPECT_NO_THROW(non_empty_folder->lookup("nested_file").result()[0]);
-    EXPECT_NO_THROW(folder2->lookup("file").result()[0]);
+    EXPECT_NO_THROW(call(non_empty_folder->lookup("nested_file"))[0]);
+    EXPECT_NO_THROW(call(folder2->lookup("file"))[0]);
 }
 
-TEST(Item, modified_time)
+TEST(Item, time)
 {
     auto runtime = Runtime::create();
 
@@ -897,19 +994,15 @@
 
     auto now = QDateTime::currentDateTimeUtc();
     sleep(1);
-    auto uploader = root->create_file("file", 0).result();
-    auto file_fut = uploader->finish_upload();
-    {
-        QFutureWatcher<File::SPtr> w;
-        QSignalSpy spy(&w, &decltype(w)::finished);
-        w.setFuture(file_fut);
-        ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
-    }
-    auto file = file_fut.result();
+    auto uploader = call(root->create_file("file", 0));
+    auto file = call(uploader->finish_upload());
     auto t = file->last_modified_time();
     // Rough check that the time is sane.
     EXPECT_LE(now, t);
     EXPECT_LE(t, now.addSecs(5));
+
+    auto creation_time = file->creation_time();
+    EXPECT_FALSE(creation_time.isValid());
 }
 
 TEST(Item, comparison)
@@ -921,41 +1014,1436 @@
     clear_folder(root);
 
     // Create two files.
-    auto uploader = root->create_file("file1", 0).result();
-    auto file_fut = uploader->finish_upload();
-    {
-        QFutureWatcher<File::SPtr> w;
-        QSignalSpy spy(&w, &decltype(w)::finished);
-        w.setFuture(file_fut);
-        ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
-    }
-    auto file1 = file_fut.result();
+    auto uploader = call(root->create_file("file1", 0));
+    auto file1 = call(uploader->finish_upload());
 
-    uploader = root->create_file("file2", 0).result();
-    file_fut = uploader->finish_upload();
-    {
-        QFutureWatcher<File::SPtr> w;
-        QSignalSpy spy(&w, &decltype(w)::finished);
-        w.setFuture(file_fut);
-        ASSERT_TRUE(spy.wait(SIGNAL_WAIT_TIME));
-    }
-    auto file2 = file_fut.result();
+    uploader = call(root->create_file("file2", 0));
+    auto file2 = call(uploader->finish_upload());
 
     EXPECT_FALSE(file1->equal_to(file2));
 
     // Retrieve file1 via lookup, so we get a different proxy.
-    auto item = root->lookup("file1").result()[0];
+    auto item = call(root->lookup("file1"))[0];
     auto other_file1 = dynamic_pointer_cast<File>(item);
     EXPECT_NE(file1, other_file1);              // Compares shared_ptr values
     EXPECT_TRUE(file1->equal_to(other_file1));  // Deep comparison
+
+    // Comparing against a deleted file must return false.
+    call(file1->delete_item());
+    EXPECT_FALSE(file1->equal_to(file2));
+    EXPECT_FALSE(file2->equal_to(file1));
+
+    // Delete file2 as well and compare again.
+    call(file2->delete_item());
+    EXPECT_FALSE(file1->equal_to(file2));
+}
+
+TEST(Item, exceptions)
+{
+    auto runtime = Runtime::create();
+
+    auto acc = get_account(runtime);
+    auto root = get_root(runtime);
+    clear_folder(root);
+
+    try
+    {
+        call(root->copy(nullptr, "new name"));
+        FAIL();
+    }
+    catch (InvalidArgumentException const& e)
+    {
+        EXPECT_EQ("Item::copy(): new_parent cannot be nullptr", e.error_message());
+    }
+
+    auto file = write_file(root, "file", 0);
+
+    try
+    {
+        call(file->copy(root, TMPFILE_PREFIX "copy_of_file"));
+        FAIL();
+    }
+    catch (InvalidArgumentException const& e)
+    {
+        EXPECT_EQ("Item::copy(): names beginning with \".storage-framework-\" are reserved", e.error_message());
+    }
+
+    try
+    {
+        call(file->copy(root, file->name()));
+        FAIL();
+    }
+    catch (ExistsException const& e)
+    {
+        EXPECT_EQ("Item::copy(): item with name \"file\" exists already", e.error_message());
+        EXPECT_EQ("file", e.name());
+        EXPECT_EQ(TEST_DIR "/storage-framework/file", e.native_identity());
+    }
+
+    try
+    {
+        auto file = write_file(root, "file", "");
+        ASSERT_EQ(0, unlink(file->native_identity().toStdString().c_str()));
+
+        call(file->copy(root, file->name()));
+        FAIL();
+    }
+    catch (ResourceException const& e)
+    {
+        EXPECT_TRUE(e.error_message().startsWith("Item::copy(): "));
+    }
+
+    try
+    {
+        auto file = write_file(root, "file", "");
+        ASSERT_EQ(0, unlink(file->native_identity().toStdString().c_str()));
+
+        call(file->move(root, "new_name"));
+        FAIL();
+    }
+    catch (ResourceException const& e)
+    {
+        EXPECT_TRUE(e.error_message().startsWith("Item::move(): "));
+    }
+
+    try
+    {
+        auto file = write_file(root, "file", "");
+        ASSERT_EQ(0, unlink(file->native_identity().toStdString().c_str()));
+        ASSERT_EQ(0, system("chmod -x " TEST_DIR "/storage-framework"));
+
+        call(file->delete_item());
+        ASSERT_EQ(0, system("chmod +x " TEST_DIR "/storage-framework"));
+        FAIL();
+    }
+    catch (ResourceException const& e)
+    {
+        ASSERT_EQ(0, system("chmod +x " TEST_DIR "/storage-framework"));
+        EXPECT_TRUE(e.error_message().startsWith("Item::delete_item(): "));
+    }
+    catch (std::exception const&)
+    {
+        ASSERT_EQ(0, system("chmod +x " TEST_DIR "/storage-framework"));
+        FAIL();
+    }
+
+    try
+    {
+        call(root->move(nullptr, "new name"));
+        FAIL();
+    }
+    catch (InvalidArgumentException const& e)
+    {
+        EXPECT_EQ("Item::move(): new_parent cannot be nullptr", e.error_message());
+    }
+
+    try
+    {
+        call(root->move(root, "new name"));
+        FAIL();
+    }
+    catch (LogicException const& e)
+    {
+        EXPECT_EQ("Item::move(): cannot move root folder", e.error_message());
+    }
+
+    try
+    {
+        auto file = write_file(root, "file", "");
+        call(file->move(root, file->name()));
+        FAIL();
+    }
+    catch (ExistsException const& e)
+    {
+        EXPECT_EQ("Item::move(): item with name \"file\" exists already", e.error_message());
+        EXPECT_EQ("file", e.name());
+        EXPECT_EQ(TEST_DIR "/storage-framework/file", e.native_identity());
+    }
+
+    try
+    {
+        call(file->move(root, TMPFILE_PREFIX "copy_of_file"));
+        FAIL();
+    }
+    catch (InvalidArgumentException const& e)
+    {
+        EXPECT_EQ("Item::move(): names beginning with \".storage-framework-\" are reserved", e.error_message());
+    }
+
+    try
+    {
+        call(root->lookup("abc/def"));
+    }
+    catch (InvalidArgumentException const& e)
+    {
+        EXPECT_EQ("Folder::lookup(): name \"abc/def\" contains more than one path component",
+                  e.error_message()) << e.what();
+    }
+
+    try
+    {
+        call(root->create_folder(".."));
+    }
+    catch (InvalidArgumentException const& e)
+    {
+        EXPECT_EQ("Folder::create_folder(): invalid name: \"..\"", e.error_message()) << e.what();
+    }
+}
+
+TEST(Folder, exceptions)
+{
+    auto runtime = Runtime::create();
+
+    auto acc = get_account(runtime);
+    auto root = get_root(runtime);
+    clear_folder(root);
+
+    try
+    {
+        write_file(root, TMPFILE_PREFIX "file", "");
+        call(root->lookup(TMPFILE_PREFIX "file"));
+        FAIL();
+    }
+    catch (NotExistsException const& e)
+    {
+        string cmd = "rm ";
+        cmd += string(TEST_DIR) + "/storage-framework/" + TMPFILE_PREFIX "file";
+        ASSERT_EQ(0, system(cmd.c_str()));
+        EXPECT_EQ("Folder::lookup(): no such item: \".storage-framework-file\"", e.error_message());
+        EXPECT_EQ(".storage-framework-file", e.key());
+    }
+
+    {
+        auto fifo_id = root->native_identity() + "/fifo";
+        string cmd = "mkfifo " + fifo_id.toStdString();
+        ASSERT_EQ(0, system(cmd.c_str()));
+
+        try
+        {
+            call(root->lookup("fifo"));
+            FAIL();
+        }
+        catch (NotExistsException const& e)
+        {
+            EXPECT_EQ("Folder::lookup(): no such item: \"fifo\"", e.error_message()) << e.what();
+            EXPECT_EQ("fifo", e.key());
+        }
+
+        cmd = "rm " + fifo_id.toStdString();
+        ASSERT_EQ(0, system(cmd.c_str()));
+    }
+
+    try
+    {
+        call(root->lookup("no_such_file"));
+        FAIL();
+    }
+    catch (NotExistsException const& e)
+    {
+        EXPECT_EQ("Folder::lookup(): no such item: \"no_such_file\"", e.error_message());
+        EXPECT_EQ("no_such_file", e.key());
+    }
+
+    try
+    {
+        call(root->create_folder(TMPFILE_PREFIX "folder"));
+        FAIL();
+    }
+    catch (InvalidArgumentException const& e)
+    {
+        EXPECT_EQ("Folder::create_folder(): names beginning with \".storage-framework-\" are reserved", e.error_message());
+    }
+
+    try
+    {
+        EXPECT_NO_THROW(call(root->create_folder("folder")));
+        call(root->create_folder("folder"));
+        FAIL();
+    }
+    catch (ExistsException const& e)
+    {
+        EXPECT_EQ("Folder::create_folder(): item with name \"folder\" exists already", e.error_message());
+        EXPECT_EQ("folder", e.name());
+        EXPECT_EQ(TEST_DIR "/storage-framework/folder", e.native_identity());
+    }
+
+    try
+    {
+        call(root->create_file("new_file", -1));
+        FAIL();
+    }
+    catch (InvalidArgumentException const& e)
+    {
+        EXPECT_EQ("Folder::create_file(): size must be >= 0", e.error_message());
+    }
+
+    try
+    {
+        call(root->create_file(TMPFILE_PREFIX "new_file", 0));
+        FAIL();
+    }
+    catch (InvalidArgumentException const& e)
+    {
+        EXPECT_EQ("Folder::create_file(): names beginning with \".storage-framework-\" are reserved", e.error_message());
+    }
+
+    try
+    {
+        write_file(root, "file", "");
+        call(root->create_file("file", 0));
+        FAIL();
+    }
+    catch (ExistsException const& e)
+    {
+        EXPECT_EQ("Folder::create_file(): item with name \"file\" exists already", e.error_message());
+        EXPECT_EQ("file", e.name());
+        EXPECT_EQ(TEST_DIR "/storage-framework/file", e.native_identity());
+    }
+
+    ASSERT_EQ(0, system("chmod -x " TEST_DIR "/storage-framework"));
+    try
+    {
+        call(root->create_file("new_file", 0));
+        ASSERT_EQ(0, system("chmod +x " TEST_DIR "/storage-framework"));
+        FAIL();
+    }
+    catch (ResourceException const& e)
+    {
+        EXPECT_TRUE(e.error_message().startsWith("Folder::create_file(): "));
+        EXPECT_EQ(EACCES, e.error_code());
+        ASSERT_EQ(0, system("chmod +x " TEST_DIR "/storage-framework"));
+    }
+    catch (std::exception const& e)
+    {
+        ASSERT_EQ(0, system("chmod +x " TEST_DIR "/storage-framework"));
+        FAIL();
+    }
+
+    ASSERT_EQ(0, system("chmod -x " TEST_DIR "/storage-framework"));
+    try
+    {
+        call(root->create_folder("new_folder"));
+        ASSERT_EQ(0, system("chmod +x " TEST_DIR "/storage-framework"));
+        FAIL();
+    }
+    catch (ResourceException const& e)
+    {
+        EXPECT_TRUE(e.error_message().startsWith("Folder::create_folder(): "));
+        EXPECT_EQ(EACCES, e.error_code());
+        ASSERT_EQ(0, system("chmod +x " TEST_DIR "/storage-framework"));
+    }
+    catch (std::exception const& e)
+    {
+        ASSERT_EQ(0, system("chmod +x " TEST_DIR "/storage-framework"));
+        FAIL();
+    }
+
+    try
+    {
+        call(root->create_file("new_file", -1));
+    }
+    catch (InvalidArgumentException const& e)
+    {
+        EXPECT_EQ("Folder::create_file(): size must be >= 0", e.error_message());
+    }
+}
+
+TEST(Root, root_exceptions)
+{
+    auto runtime = Runtime::create();
+
+    auto acc = get_account(runtime);
+    auto root = get_root(runtime);
+    clear_folder(root);
+
+    try
+    {
+        call(root->delete_item());
+        FAIL();
+    }
+    catch (LogicException const& e)
+    {
+        EXPECT_EQ("Root::delete_item(): Cannot delete root folder", e.error_message());
+    }
+
+    try
+    {
+        call(root->get("abc"));
+        FAIL();
+    }
+    catch (InvalidArgumentException const& e)
+    {
+        EXPECT_EQ("Root::get(): identity \"abc\" must be an absolute path", e.error_message());
+    }
+
+    try
+    {
+        call(root->get("/etc"));
+        FAIL();
+    }
+    catch (InvalidArgumentException const& e)
+    {
+        EXPECT_EQ("Root::get(): identity \"/etc\" points outside the root folder", e.error_message());
+    }
+
+    {
+        auto folder = call(root->create_folder("folder"));
+        auto file = write_file(folder, "testfile", "hello");
+
+        // Remove permission from folder.
+        string cmd = "chmod -x " + folder->native_identity().toStdString();
+        ASSERT_EQ(0, system(cmd.c_str()));
+
+        try
+        {
+            file = dynamic_pointer_cast<File>(call(root->get(file->native_identity())));
+            FAIL();
+        }
+        catch (PermissionException const& e)
+        {
+            EXPECT_TRUE(e.error_message().startsWith("Root::get(): "));
+            EXPECT_TRUE(e.error_message().contains("Permission denied"));
+        }
+
+        cmd = "chmod +x " + folder->native_identity().toStdString();
+        ASSERT_EQ(0, system(cmd.c_str()));
+
+        clear_folder(root);
+    }
+
+    {
+        auto file = write_file(root, "testfile", "hello");
+
+        QString id = file->native_identity();
+        id.append("_doesnt_exist");
+
+        try
+        {
+            file = dynamic_pointer_cast<File>(call(root->get(id)));
+            FAIL();
+        }
+        catch (NotExistsException const& e)
+        {
+            EXPECT_EQ(id, e.key());
+        }
+
+        clear_folder(root);
+    }
+
+    {
+        auto fifo_id = root->native_identity() + "/fifo";
+        string cmd = "mkfifo " + fifo_id.toStdString();
+        ASSERT_EQ(0, system(cmd.c_str()));
+
+        try
+        {
+            call(root->get(fifo_id));
+            FAIL();
+        }
+        catch (NotExistsException const& e)
+        {
+            EXPECT_EQ(fifo_id, e.key());
+        }
+
+        cmd = "rm " + fifo_id.toStdString();
+        ASSERT_EQ(0, system(cmd.c_str()));
+    }
+
+    {
+        string reserved_name = TMPFILE_PREFIX "somefile";
+        string full_path = string(TEST_DIR) + "/storage-framework/" + reserved_name;
+        string cmd = "touch ";
+        cmd += full_path;
+        ASSERT_EQ(0, system(cmd.c_str()));
+
+        auto reserved_id = QString::fromStdString(full_path);
+        try
+        {
+            call(root->get(reserved_id));
+            FAIL();
+        }
+        catch (NotExistsException const& e)
+        {
+            EXPECT_EQ(reserved_id, e.key());
+        }
+
+        clear_folder(root);
+    }
+}
+
+TEST(Item, deleted_exceptions)
+{
+    auto runtime = Runtime::create();
+
+    auto acc = get_account(runtime);
+    auto root = get_root(runtime);
+    clear_folder(root);
+
+    try
+    {
+        auto file = make_deleted_file(root, "file");
+        file->etag();
+        FAIL();
+    }
+    catch (DeletedException const& e)
+    {
+        EXPECT_EQ("file", e.name());
+        EXPECT_TRUE(e.error_message().startsWith("Item::etag(): "));
+        EXPECT_TRUE(e.error_message().endsWith(" was deleted previously"));
+        EXPECT_EQ(TEST_DIR "/storage-framework/file", e.native_identity());
+    }
+
+    try
+    {
+        auto file = make_deleted_file(root, "file");
+        file->metadata();
+        FAIL();
+    }
+    catch (DeletedException const& e)
+    {
+        EXPECT_EQ("file", e.name());
+        EXPECT_TRUE(e.error_message().startsWith("Item::metadata(): "));
+    }
+
+    try
+    {
+        auto file = make_deleted_file(root, "file");
+        file->last_modified_time();
+        FAIL();
+    }
+    catch (DeletedException const& e)
+    {
+        EXPECT_EQ("file", e.name());
+        EXPECT_TRUE(e.error_message().startsWith("Item::last_modified_time(): "));
+    }
+
+    try
+    {
+        // Copying deleted file must fail.
+        auto file = make_deleted_file(root, "file");
+        call(file->copy(root, "copy_of_file"));
+        FAIL();
+    }
+    catch (DeletedException const& e)
+    {
+        EXPECT_EQ("file", e.name());
+        EXPECT_TRUE(e.error_message().startsWith("Item::copy(): "));
+    }
+
+    try
+    {
+        // Copying file into deleted folder must fail.
+
+        // Make target folder.
+        auto folder = call(root->create_folder("folder"));
+
+        // Make a file in the root.
+        auto uploader = call(root->create_file("file", 0));
+        auto file = call(uploader->finish_upload());
+
+        // Delete folder.
+        call(folder->delete_item());
+
+        call(file->copy(folder, "file"));
+        FAIL();
+    }
+    catch (DeletedException const& e)
+    {
+        EXPECT_EQ("folder", e.name());
+        EXPECT_TRUE(e.error_message().startsWith("Item::copy(): "));
+    }
+    clear_folder(root);
+
+    try
+    {
+        // Moving deleted file must fail.
+        auto file = make_deleted_file(root, "file");
+        call(file->move(root, "moved_file"));
+        FAIL();
+    }
+    catch (DeletedException const& e)
+    {
+        EXPECT_EQ("file", e.name());
+        EXPECT_TRUE(e.error_message().startsWith("Item::move(): "));
+    }
+
+    try
+    {
+        // Moving file into deleted folder must fail.
+
+        // Make target folder.
+        auto folder = call(root->create_folder("folder"));
+
+        // Make a file in the root.
+        auto uploader = call(root->create_file("file", 0));
+        auto file = call(uploader->finish_upload());
+
+        // Delete folder.
+        call(folder->delete_item());
+
+        call(file->move(folder, "file"));
+        FAIL();
+    }
+    catch (DeletedException const& e)
+    {
+        EXPECT_EQ("folder", e.name());
+        EXPECT_TRUE(e.error_message().startsWith("Item::move(): "));
+    }
+    clear_folder(root);
+
+    try
+    {
+        auto file = make_deleted_file(root, "file");
+        call(file->parents());
+        FAIL();
+    }
+    catch (DeletedException const& e)
+    {
+        EXPECT_EQ("file", e.name());
+        EXPECT_TRUE(e.error_message().startsWith("Item::parents(): "));
+    }
+
+    try
+    {
+        auto file = make_deleted_file(root, "file");
+        file->parent_ids();
+        FAIL();
+    }
+    catch (DeletedException const& e)
+    {
+        EXPECT_EQ("file", e.name());
+        EXPECT_TRUE(e.error_message().startsWith("Item::parent_ids(): "));
+    }
+
+    try
+    {
+        // Deleting a deleted item must fail.
+        auto file = make_deleted_file(root, "file");
+        call(file->delete_item());
+        FAIL();
+    }
+    catch (DeletedException const& e)
+    {
+        EXPECT_EQ("file", e.name());
+        EXPECT_TRUE(e.error_message().startsWith("Item::delete_item(): "));
+    }
+}
+
+TEST(Folder, deleted_exceptions)
+{
+    auto runtime = Runtime::create();
+
+    auto acc = get_account(runtime);
+    auto root = get_root(runtime);
+    clear_folder(root);
+
+    try
+    {
+        auto folder = make_deleted_folder(root, "folder");
+        folder->name();
+        FAIL();
+    }
+    catch (DeletedException const& e)
+    {
+        EXPECT_EQ("folder", e.name());
+        EXPECT_TRUE(e.error_message().startsWith("Folder::name(): "));
+    }
+
+    try
+    {
+        auto folder = make_deleted_folder(root, "folder");
+        call(folder->list());
+        FAIL();
+    }
+    catch (DeletedException const& e)
+    {
+        EXPECT_EQ("folder", e.name());
+        EXPECT_TRUE(e.error_message().startsWith("Folder::list(): "));
+    }
+
+    try
+    {
+        auto folder = make_deleted_folder(root, "folder");
+        call(folder->lookup("something"));
+        FAIL();
+    }
+    catch (DeletedException const& e)
+    {
+        EXPECT_EQ("folder", e.name());
+        EXPECT_TRUE(e.error_message().startsWith("Folder::lookup(): "));
+    }
+
+    try
+    {
+        auto folder = make_deleted_folder(root, "folder");
+        call(folder->list());
+        FAIL();
+    }
+    catch (DeletedException const& e)
+    {
+        EXPECT_EQ("folder", e.name());
+        EXPECT_TRUE(e.error_message().startsWith("Folder::list(): "));
+    }
+
+    try
+    {
+        auto folder = make_deleted_folder(root, "folder");
+        call(folder->create_folder("nested_folder"));
+        FAIL();
+    }
+    catch (DeletedException const& e)
+    {
+        EXPECT_EQ("folder", e.name());
+        EXPECT_TRUE(e.error_message().startsWith("Folder::create_folder(): "));
+    }
+
+    try
+    {
+        auto folder = make_deleted_folder(root, "folder");
+        call(folder->create_file("nested_file", 0));
+        FAIL();
+    }
+    catch (DeletedException const& e)
+    {
+        EXPECT_EQ("folder", e.name());
+        EXPECT_TRUE(e.error_message().startsWith("Folder::create_file(): "));
+    }
+
+    try
+    {
+        auto folder = make_deleted_folder(root, "folder");
+        folder->creation_time();
+        FAIL();
+    }
+    catch (DeletedException const& e)
+    {
+        EXPECT_EQ("folder", e.name());
+        EXPECT_TRUE(e.error_message().startsWith("Item::creation_time(): ")) << e.what();
+    }
+
+    try
+    {
+        auto folder = make_deleted_folder(root, "folder");
+        folder->native_metadata();
+        FAIL();
+    }
+    catch (DeletedException const& e)
+    {
+        EXPECT_EQ("folder", e.name());
+        EXPECT_TRUE(e.error_message().startsWith("Item::native_metadata(): ")) << e.what();
+    }
+}
+
+TEST(File, deleted_exceptions)
+{
+    auto runtime = Runtime::create();
+
+    auto acc = get_account(runtime);
+    auto root = get_root(runtime);
+    clear_folder(root);
+
+    try
+    {
+        auto file = make_deleted_file(root, "file");
+        file->name();
+        FAIL();
+    }
+    catch (DeletedException const& e)
+    {
+        EXPECT_EQ("file", e.name());
+        EXPECT_TRUE(e.error_message().startsWith("File::name(): "));
+        EXPECT_TRUE(e.error_message().endsWith(" was deleted previously"));
+        EXPECT_EQ(TEST_DIR "/storage-framework/file", e.native_identity());
+    }
+
+    try
+    {
+        auto file = make_deleted_file(root, "file");
+        file->size();
+        FAIL();
+    }
+    catch (DeletedException const& e)
+    {
+        EXPECT_EQ("file", e.name());
+        EXPECT_TRUE(e.error_message().startsWith("File::size(): "));
+        EXPECT_TRUE(e.error_message().endsWith(" was deleted previously"));
+        EXPECT_EQ(TEST_DIR "/storage-framework/file", e.native_identity());
+    }
+
+    try
+    {
+        auto file = make_deleted_file(root, "file");
+        call(file->create_uploader(ConflictPolicy::overwrite, 0));
+        FAIL();
+    }
+    catch (DeletedException const& e)
+    {
+        EXPECT_EQ("file", e.name());
+        EXPECT_TRUE(e.error_message().startsWith("File::create_uploader(): "));
+        EXPECT_TRUE(e.error_message().endsWith(" was deleted previously"));
+        EXPECT_EQ(TEST_DIR "/storage-framework/file", e.native_identity());
+    }
+
+    try
+    {
+        auto file = make_deleted_file(root, "file");
+        call(file->create_downloader());
+        FAIL();
+    }
+    catch (DeletedException const& e)
+    {
+        EXPECT_EQ("file", e.name());
+        EXPECT_TRUE(e.error_message().startsWith("File::create_downloader(): "));
+        EXPECT_TRUE(e.error_message().endsWith(" was deleted previously"));
+        EXPECT_EQ(TEST_DIR "/storage-framework/file", e.native_identity());
+    }
+}
+
+TEST(Runtime, runtime_destroyed_exceptions)
+{
+    // Gettting an account after shutting down the runtime must fail.
+    {
+        auto runtime = Runtime::create();
+        auto acc = get_account(runtime);
+        runtime->shutdown();
+        try
+        {
+            acc->runtime();
+            FAIL();
+        }
+        catch (RuntimeDestroyedException const& e)
+        {
+            EXPECT_EQ("Account::runtime(): Runtime was destroyed previously", e.error_message());
+        }
+    }
+
+    // Getting an account after destroying the runtime must fail.
+    {
+        auto runtime = Runtime::create();
+        auto acc = get_account(runtime);
+        runtime.reset();
+        try
+        {
+            acc->runtime();
+            FAIL();
+        }
+        catch (RuntimeDestroyedException const& e)
+        {
+            EXPECT_EQ("Account::runtime(): Runtime was destroyed previously", e.error_message());
+        }
+    }
+
+    // Getting accounts after shutting down the runtime must fail.
+    {
+        auto runtime = Runtime::create();
+        runtime->shutdown();
+        try
+        {
+            runtime->accounts();
+            FAIL();
+        }
+        catch (RuntimeDestroyedException const& e)
+        {
+            EXPECT_EQ("Runtime::accounts(): Runtime was destroyed previously", e.error_message());
+        }
+    }
+
+    // Getting the account from a root with a destroyed runtime must fail.
+    {
+        auto runtime = Runtime::create();
+        auto acc = get_account(runtime);
+        auto root = get_root(runtime);
+        runtime.reset();
+        try
+        {
+            root->account();
+            FAIL();
+        }
+        catch (RuntimeDestroyedException const& e)
+        {
+            EXPECT_EQ("Root::account(): Runtime was destroyed previously", e.error_message());
+        }
+    }
+
+    // Getting the account from a root with a destroyed account must fail.
+    {
+        auto runtime = Runtime::create();
+        auto acc = get_account(runtime);
+        auto root = get_root(runtime);
+        runtime.reset();
+        acc.reset();
+        try
+        {
+            root->account();
+            FAIL();
+        }
+        catch (RuntimeDestroyedException const& e)
+        {
+            EXPECT_EQ("Root::account(): Runtime was destroyed previously", e.error_message());
+        }
+    }
+
+    // Getting the root from an item with a destroyed runtime must fail.
+    {
+        auto runtime = Runtime::create();
+        auto acc = get_account(runtime);
+        auto root = get_root(runtime);
+        clear_folder(root);
+
+        auto file = write_file(root, "file", "");
+        runtime.reset();
+        try
+        {
+            file->root();
+            FAIL();
+        }
+        catch (RuntimeDestroyedException const& e)
+        {
+            EXPECT_EQ("Item::root(): Runtime was destroyed previously", e.error_message());
+        }
+    }
+
+    // Getting the root from an item with a destroyed root must fail.
+    {
+        auto runtime = Runtime::create();
+        auto acc = get_account(runtime);
+        auto root = get_root(runtime);
+        clear_folder(root);
+
+        auto file = write_file(root, "file", "");
+        runtime.reset();
+        acc.reset();
+        root.reset();
+        try
+        {
+            file->root();
+            FAIL();
+        }
+        catch (RuntimeDestroyedException const& e)
+        {
+            EXPECT_EQ("Item::root(): Runtime was destroyed previously", e.error_message());
+        }
+    }
+
+    // etag() with destroyed runtime must fail.
+    {
+        auto runtime = Runtime::create();
+        auto acc = get_account(runtime);
+        auto root = get_root(runtime);
+        clear_folder(root);
+
+        auto file = write_file(root, "file", "");
+        runtime->shutdown();
+        try
+        {
+            file->etag();
+            FAIL();
+        }
+        catch (RuntimeDestroyedException const& e)
+        {
+            EXPECT_EQ("Item::etag(): Runtime was destroyed previously", e.error_message());
+        }
+    }
+
+    // metadata() with destroyed runtime must fail.
+    {
+        auto runtime = Runtime::create();
+        auto acc = get_account(runtime);
+        auto root = get_root(runtime);
+        clear_folder(root);
+
+        auto file = write_file(root, "file", "");
+        runtime->shutdown();
+        try
+        {
+            file->metadata();
+            FAIL();
+        }
+        catch (RuntimeDestroyedException const& e)
+        {
+            EXPECT_EQ("Item::metadata(): Runtime was destroyed previously", e.error_message());
+        }
+    }
+
+    // last_modified_time() with destroyed runtime must fail.
+    {
+        auto runtime = Runtime::create();
+        auto acc = get_account(runtime);
+        auto root = get_root(runtime);
+        clear_folder(root);
+
+        auto file = write_file(root, "file", "");
+        runtime->shutdown();
+        try
+        {
+            file->last_modified_time();
+            FAIL();
+        }
+        catch (RuntimeDestroyedException const& e)
+        {
+            EXPECT_EQ("Item::last_modified_time(): Runtime was destroyed previously", e.error_message());
+        }
+    }
+
+    // copy() with destroyed runtime must fail.
+    {
+        auto runtime = Runtime::create();
+        auto acc = get_account(runtime);
+        auto root = get_root(runtime);
+        clear_folder(root);
+
+        auto file = write_file(root, "file", "");
+        runtime->shutdown();
+        try
+        {
+            call(file->copy(root, "file2"));
+            FAIL();
+        }
+        catch (RuntimeDestroyedException const& e)
+        {
+            EXPECT_EQ("Item::copy(): Runtime was destroyed previously", e.error_message());
+        }
+    }
+
+    // move() with destroyed runtime must fail.
+    {
+        auto runtime = Runtime::create();
+        auto acc = get_account(runtime);
+        auto root = get_root(runtime);
+        clear_folder(root);
+
+        auto file = write_file(root, "file", "");
+        runtime->shutdown();
+        try
+        {
+            call(file->move(root, "file2"));
+            FAIL();
+        }
+        catch (RuntimeDestroyedException const& e)
+        {
+            EXPECT_EQ("Item::move(): Runtime was destroyed previously", e.error_message());
+        }
+    }
+
+    // parents() on root with destroyed runtime must fail.
+    {
+        auto runtime = Runtime::create();
+        auto acc = get_account(runtime);
+        auto root = get_root(runtime);
+        clear_folder(root);
+
+        auto file = write_file(root, "file", "");
+        runtime->shutdown();
+        try
+        {
+            call(root->parents());
+            FAIL();
+        }
+        catch (RuntimeDestroyedException const& e)
+        {
+            EXPECT_EQ("Root::parents(): Runtime was destroyed previously", e.error_message());
+        }
+    }
+
+    // parents() on file with destroyed runtime must fail.
+    {
+        auto runtime = Runtime::create();
+        auto acc = get_account(runtime);
+        auto root = get_root(runtime);
+        clear_folder(root);
+
+        auto file = write_file(root, "file", "");
+        runtime->shutdown();
+        try
+        {
+            call(file->parents());
+            FAIL();
+        }
+        catch (RuntimeDestroyedException const& e)
+        {
+            EXPECT_EQ("Item::parents(): Runtime was destroyed previously", e.error_message());
+        }
+    }
+
+    // parent_ids() with destroyed runtime must fail.
+    {
+        auto runtime = Runtime::create();
+        auto acc = get_account(runtime);
+        auto root = get_root(runtime);
+        clear_folder(root);
+
+        auto file = write_file(root, "file", "");
+        runtime->shutdown();
+        try
+        {
+            file->parent_ids();
+            FAIL();
+        }
+        catch (RuntimeDestroyedException const& e)
+        {
+            EXPECT_EQ("Item::parent_ids(): Runtime was destroyed previously", e.error_message());
+        }
+    }
+
+    // parent_ids() on root with destroyed runtime must fail.
+    {
+        auto runtime = Runtime::create();
+        auto acc = get_account(runtime);
+        auto root = get_root(runtime);
+        clear_folder(root);
+
+        runtime->shutdown();
+        try
+        {
+            root->parent_ids();
+            FAIL();
+        }
+        catch (RuntimeDestroyedException const& e)
+        {
+            EXPECT_EQ("Root::parent_ids(): Runtime was destroyed previously", e.error_message());
+        }
+    }
+
+    // delete_item() with destroyed runtime must fail.
+    {
+        auto runtime = Runtime::create();
+        auto acc = get_account(runtime);
+        auto root = get_root(runtime);
+        clear_folder(root);
+
+        auto file = write_file(root, "file", "");
+        runtime->shutdown();
+        try
+        {
+            call(file->delete_item());
+            FAIL();
+        }
+        catch (RuntimeDestroyedException const& e)
+        {
+            EXPECT_EQ("Item::delete_item(): Runtime was destroyed previously", e.error_message());
+        }
+    }
+
+    // delete_item() on root with destroyed runtime must fail.
+    {
+        auto runtime = Runtime::create();
+        auto acc = get_account(runtime);
+        auto root = get_root(runtime);
+        clear_folder(root);
+
+        runtime->shutdown();
+        try
+        {
+            call(root->delete_item());
+            FAIL();
+        }
+        catch (RuntimeDestroyedException const& e)
+        {
+            EXPECT_EQ("Root::delete_item(): Runtime was destroyed previously", e.error_message());
+        }
+    }
+
+    // creation_time() with destroyed runtime must fail.
+    {
+        auto runtime = Runtime::create();
+        auto acc = get_account(runtime);
+        auto root = get_root(runtime);
+        clear_folder(root);
+
+        auto file = write_file(root, "file", "");
+        runtime->shutdown();
+        try
+        {
+            file->creation_time();
+            FAIL();
+        }
+        catch (RuntimeDestroyedException const& e)
+        {
+            EXPECT_EQ("Item::creation_time(): Runtime was destroyed previously", e.error_message());
+        }
+    }
+
+    // native_metadata() with destroyed runtime must fail.
+    {
+        auto runtime = Runtime::create();
+        auto acc = get_account(runtime);
+        auto root = get_root(runtime);
+        clear_folder(root);
+
+        auto file = write_file(root, "file", "");
+        runtime->shutdown();
+        try
+        {
+            file->native_metadata();
+            FAIL();
+        }
+        catch (RuntimeDestroyedException const& e)
+        {
+            EXPECT_EQ("Item::native_metadata(): Runtime was destroyed previously", e.error_message());
+        }
+    }
+
+    // name() on root with destroyed runtime must fail.
+    {
+        auto runtime = Runtime::create();
+        auto acc = get_account(runtime);
+        auto root = get_root(runtime);
+        clear_folder(root);
+
+        runtime->shutdown();
+        try
+        {
+            root->name();
+            FAIL();
+        }
+        catch (RuntimeDestroyedException const& e)
+        {
+            EXPECT_EQ("Root::name(): Runtime was destroyed previously", e.error_message());
+        }
+    }
+
+    // name() on folder with destroyed runtime must fail.
+    {
+        auto runtime = Runtime::create();
+        auto acc = get_account(runtime);
+        auto root = get_root(runtime);
+        clear_folder(root);
+
+        auto folder = call(root->create_folder("folder"));
+        runtime->shutdown();
+        try
+        {
+            folder->name();
+            FAIL();
+        }
+        catch (RuntimeDestroyedException const& e)
+        {
+            EXPECT_EQ("Folder::name(): Runtime was destroyed previously", e.error_message());
+        }
+    }
+
+    // name() on file with destroyed runtime must fail.
+    {
+        auto runtime = Runtime::create();
+        auto acc = get_account(runtime);
+        auto root = get_root(runtime);
+        clear_folder(root);
+
+        auto file = write_file(root, "file", "");
+        runtime->shutdown();
+        try
+        {
+            file->name();
+            FAIL();
+        }
+        catch (RuntimeDestroyedException const& e)
+        {
+            EXPECT_EQ("File::name(): Runtime was destroyed previously", e.error_message());
+        }
+    }
+
+    // list() with destroyed runtime must fail.
+    {
+        auto runtime = Runtime::create();
+        auto acc = get_account(runtime);
+        auto root = get_root(runtime);
+        clear_folder(root);
+
+        runtime->shutdown();
+        try
+        {
+            call(root->list());
+            FAIL();
+        }
+        catch (RuntimeDestroyedException const& e)
+        {
+            EXPECT_EQ("Folder::list(): Runtime was destroyed previously", e.error_message());
+        }
+    }
+
+    // lookup() with destroyed runtime must fail.
+    {
+        auto runtime = Runtime::create();
+        auto acc = get_account(runtime);
+        auto root = get_root(runtime);
+        clear_folder(root);
+
+        runtime->shutdown();
+        try
+        {
+            call(root->lookup("file"));
+            FAIL();
+        }
+        catch (RuntimeDestroyedException const& e)
+        {
+            EXPECT_EQ("Folder::lookup(): Runtime was destroyed previously", e.error_message());
+        }
+    }
+
+    // create_folder() with destroyed runtime must fail.
+    {
+        auto runtime = Runtime::create();
+        auto acc = get_account(runtime);
+        auto root = get_root(runtime);
+        clear_folder(root);
+
+        runtime->shutdown();
+        try
+        {
+            call(root->create_folder("folder"));
+            FAIL();
+        }
+        catch (RuntimeDestroyedException const& e)
+        {
+            EXPECT_EQ("Folder::create_folder(): Runtime was destroyed previously", e.error_message());
+        }
+    }
+
+    // create_file() with destroyed runtime must fail.
+    {
+        auto runtime = Runtime::create();
+        auto acc = get_account(runtime);
+        auto root = get_root(runtime);
+        clear_folder(root);
+
+        runtime->shutdown();
+        try
+        {
+            call(root->create_file("file", 0));
+            FAIL();