1
=== modified file 'src/qt/client/internal/remote_client/RuntimeImpl.cpp'
2
--- src/qt/client/internal/remote_client/RuntimeImpl.cpp	2016-08-03 06:29:48 +0000
3
+++ src/qt/client/internal/remote_client/RuntimeImpl.cpp	2016-08-11 06:12:08 +0000
4
@@ -123,15 +123,22 @@
5
123
    }
123
    }
6
124
124
7
125
    timer_.stop();
125
    timer_.stop();
8
126
9
127
    static QString const service_ids[] = { "com.canonical.scopes.mcloud_mcloud_mcloud", "google-drive-scope" };
10
128
11
126
    try
129
    try
12
127
    {
130
    {
13
128
        QVector<Account::SPtr> accounts;
131
        QVector<Account::SPtr> accounts;
15
129
        for (auto const& a : manager_->availableAccounts("google-drive-scope"))
132
        for (auto const service_id : service_ids)
16
130
        {
133
        {
21
131
            auto impl = new AccountImpl(public_instance_, a->id(), "", a->serviceId(), a->displayName());
134
            for (auto const& a : manager_->availableAccounts(service_id))
22
132
            Account::SPtr acc(new Account(impl));
135
            {
23
133
            impl->set_public_instance(acc);
136
                qDebug() << "got account:" << a->displayName() << a->serviceId() << a->id();
24
134
            accounts.append(acc);
137
                auto impl = new AccountImpl(public_instance_, a->id(), "", a->serviceId(), a->displayName());
25
138
                Account::SPtr acc(new Account(impl));
26
139
                impl->set_public_instance(acc);
27
140
                accounts.append(acc);
28
141
            }
29
135
        }
142
        }
30
136
        accounts_ = accounts;
143
        accounts_ = accounts;
31
137
        make_ready_future(qf_, accounts);
144
        make_ready_future(qf_, accounts);
32
138
145
33
=== modified file 'tests/remote-client/remote-client_test.cpp'
34
--- tests/remote-client/remote-client_test.cpp	2016-08-05 05:37:23 +0000
35
+++ tests/remote-client/remote-client_test.cpp	2016-08-11 06:12:08 +0000
36
@@ -52,7 +52,7 @@
37
52
    void SetUp() override
52
    void SetUp() override
38
53
    {
53
    {
39
54
        dbus_.reset(new DBusEnvironment);
54
        dbus_.reset(new DBusEnvironment);
41
55
        dbus_->add_demo_provider("google-drive-scope");
55
        dbus_->add_demo_provider("com.canonical.scopes.mcloud_mcloud_mcloud");
42
56
        dbus_->start_services();
56
        dbus_->start_services();
43
57
    }
57
    }
44
58
58
45
@@ -188,8 +188,8 @@
46
188
    auto acc = get_account(runtime);
188
    auto acc = get_account(runtime);
47
189
    EXPECT_EQ(runtime, acc->runtime());
189
    EXPECT_EQ(runtime, acc->runtime());
48
190
    EXPECT_EQ("", acc->owner());
190
    EXPECT_EQ("", acc->owner());
51
191
    EXPECT_EQ("google-drive-scope", acc->owner_id()) << acc->owner_id().toStdString();
191
    EXPECT_EQ("com.canonical.scopes.mcloud_mcloud_mcloud", acc->owner_id());
52
192
    EXPECT_EQ("Fake google account", acc->description()) << acc->description().toStdString();
192
    EXPECT_EQ("Fake mcloud account", acc->description());
53
193
}
193
}
54
194
194
55
195
TEST_F(RuntimeTest, roots)
195
TEST_F(RuntimeTest, roots)
56
196
196
57
=== modified file 'tests/utils/fake-online-accounts-daemon.py'
58
--- tests/utils/fake-online-accounts-daemon.py	2016-07-25 07:14:18 +0000
59
+++ tests/utils/fake-online-accounts-daemon.py	2016-08-11 06:12:08 +0000
60
@@ -156,6 +156,8 @@
61
156
                Password("user", "pass")),
156
                Password("user", "pass")),
62
157
        Account(42, "Fake google account", "google-drive-scope",
157
        Account(42, "Fake google account", "google-drive-scope",
63
158
                OAuth2("fake-google-access-token", 0, [])),
158
                OAuth2("fake-google-access-token", 0, [])),
64
159
        Account(99, "Fake mcloud account", "com.canonical.scopes.mcloud_mcloud_mcloud",
65
160
                OAuth2("fake-mcloud-access-token", 0, [])),
66
159
    ]
161
    ]
67
160
    server = Server(accounts)
162
    server = Server(accounts)
68
161
    server.run()
163
    server.run()
Status:	Merged
Approved by:	Michi Henning on 2016-08-11
Approved revision:	48
Merged at revision:	50
Proposed branch:	lp:~michihenning/storage-framework/add-mcloud-scope
Merge into:	lp:storage-framework/devel
Diff against target:	68 lines (+17/-8) 3 files modified src/qt/client/internal/remote_client/RuntimeImpl.cpp (+12/-5) tests/remote-client/remote-client_test.cpp (+3/-3) tests/utils/fake-online-accounts-daemon.py (+2/-0)
To merge this branch:	bzr merge lp:~michihenning/storage-framework/add-mcloud-scope
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
unity-api-1-bot	continuous-integration		Approve on 2016-08-11
James Henstridge		2016-08-11	Approve on 2016-08-11
Review via email: mp+302619@code.launchpad.net