Merge lp:~michihenning/storage-framework/provider-map into lp:storage-framework/devel

[Michi Henning]

Got rid of hard-wired bus name in RuntimeImpl.

Replaced hard-wired bus name in remote client with a map, so we can use it with both the demo provider and the real mcloud provider. If a provider isn't present, we ignore it and print a trace message. This is still dirty, but will have to do until we have a proper registry.

[James Henstridge (jamesh)]

Looks good!

review: Approve

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

PASSED: Continuous integration, rev:56
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/80/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/419
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/425
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=vivid+overlay/332
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=xenial+overlay/332
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=yakkety/332
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/262
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/262/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/262
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/262/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/262
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/262/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/262
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/262/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/262
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/262/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/262
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/262/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/262
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/262/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/262
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/262/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/262
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/262/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'src/qt/client/internal/remote_client/RuntimeImpl.cpp'
--- src/qt/client/internal/remote_client/RuntimeImpl.cpp	2016-08-17 02:55:12 +0000
+++ src/qt/client/internal/remote_client/RuntimeImpl.cpp	2016-08-19 03:21:01 +0000
@@ -44,8 +44,14 @@
 
 namespace
 {
-constexpr char BUS_NAME[] = "com.canonical.StorageFramework.Provider.ProviderTest";
-}
+
+static const map<QString, QString> BUS_NAMES =
+{
+    { "google-drive-scope", "com.canonical.StorageFramework.Provider.ProviderTest" },
+    { "com.canonical.scopes.mcloud_mcloud_mcloud", "com.canonical.StorageFramework.Provider.McloudProvider" }
+};
+
+}  // namespace
 
 namespace unity
 {
@@ -130,18 +136,26 @@
 
     timer_.stop();
 
-    static QString const service_ids[] = { "com.canonical.scopes.mcloud_mcloud_mcloud", "google-drive-scope" };
-
     try
     {
         QVector<Account::SPtr> accounts;
-        for (auto const service_id : service_ids)
+        for (auto const map_entry : BUS_NAMES)
         {
+            auto service_id = map_entry.first;
             for (auto const& a : manager_->availableAccounts(service_id))
             {
                 auto object_path = QStringLiteral("/provider/%1").arg(a->id());
-                accounts.append(make_account(BUS_NAME, object_path,
-                                             "", a->serviceId(), a->displayName()));
+                try
+                {
+                    auto bus_name = map_entry.second;
+                    accounts.append(make_account(bus_name, object_path,
+                                                 "", a->serviceId(), a->displayName()));
+
+                }
+                catch (LocalCommsException const& e)
+                {
+                    qDebug() << "RuntimeImpl: ignoring non-existent provider" << a->serviceId();
+                }
             }
         }
         accounts_ = accounts;

=== modified file 'tests/remote-client/remote-client_test.cpp'
--- tests/remote-client/remote-client_test.cpp	2016-08-18 09:25:51 +0000
+++ tests/remote-client/remote-client_test.cpp	2016-08-19 03:21:01 +0000
@@ -52,7 +52,7 @@
     void SetUp() override
     {
         dbus_.reset(new DBusEnvironment);
-        dbus_->add_demo_provider("com.canonical.scopes.mcloud_mcloud_mcloud");
+        dbus_->add_demo_provider("google-drive-scope");
         dbus_->start_services();
     }
 
@@ -121,7 +121,7 @@
 {
     auto acc = get_account(runtime);
     auto roots = call(acc->roots());
-    assert(roots.size() >= 1);
+    assert(roots.size() == 1);
     return roots[0];
 }
 
@@ -157,8 +157,8 @@
     auto acc = get_account(runtime);
     EXPECT_EQ(runtime, acc->runtime());
     EXPECT_EQ("", acc->owner());
-    EXPECT_EQ("com.canonical.scopes.mcloud_mcloud_mcloud", acc->owner_id());
-    EXPECT_EQ("Fake mcloud account", acc->description());
+    EXPECT_EQ("google-drive-scope", acc->owner_id());
+    EXPECT_EQ("Fake google account", acc->description());
 }
 
 TEST_F(RuntimeTest, roots)