Merge lp:~laney/ubuntu-system-settings/as-activation into lp:ubuntu-system-settings

as-activation
Merge into trunk

Proposed by Iain Lane on 2014-07-08

Status:	Merged
Approved by:	Sebastien Bacher on 2014-07-11
Approved revision:	777
Merged at revision:	792
Proposed branch:	lp:~laney/ubuntu-system-settings/as-activation
Merge into:	lp:ubuntu-system-settings
Diff against target:	51 lines (+7/-15) 1 file modified src/accountsservice.cpp (+7/-15)
To merge this branch:	bzr merge lp:~laney/ubuntu-system-settings/as-activation
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-07-11
Sebastien Bacher (community)		2014-07-08	Approve on 2014-07-11
Review via email: mp+225953@code.launchpad.net

Commit Message

[accountsservice] Don't guard D-Bus calls with isValid, because that doesn't work if the service has timed out.

Description of the Change

This is basically the same as https://code.launchpad.net/~laney/ubuntu-system-settings/timedated-activation/+merge/225944

Brendan Donegan (brendan-donegan) wrote on 2014-07-08:

Any chance of adding a test for the failure scenario this fixes?

Iain Lane (laney) wrote on 2014-07-08:

On Tue, Jul 08, 2014 at 11:31:16AM -0000, Brendan Donegan wrote:
> Any chance of adding a test for the failure scenario this fixes?

If you want a test which takes ten minutes?

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

Iain Lane (laney) wrote on 2014-07-08:

> On Tue, Jul 08, 2014 at 11:31:16AM -0000, Brendan Donegan wrote:
> > Any chance of adding a test for the failure scenario this fixes?
>
> If you want a test which takes ten minutes?

I guess you could mock AS actually.

PS Jenkins bot (ps-jenkins) wrote on 2014-07-08:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/940/rebuild

review: Needs Fixing (continuous-integration)

Iain Lane (laney) wrote on 2014-07-09:

It's going to be a bit of an undertaking to get dbusnock to support bus activation. Might be best to land these now.

Sebastien Bacher (seb128) wrote on 2014-07-11:

That makes sense, thanks

review: Approve

PS Jenkins bot (ps-jenkins) wrote on 2014-07-11:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/965/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2014-07-11:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/966/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Iain Lane

Ubuntu Touch System Settings

 === modified file 'src/accountsservice.cpp'
 --- src/accountsservice.cpp	2014-01-06 17:40:07 +0000
 +++ src/accountsservice.cpp	2014-07-08 11:06:40 +0000
@@ -45,9 +45,7 @@
               this,
               SLOT (slotNameOwnerChanged (QString, QString, QString)));
--    if (m_accountsserviceIface.isValid()) {
--        setUpInterface();
--    }
++    setUpInterface();
+ }
  void AccountsService::slotChanged(QString interface,
@@ -101,8 +99,6 @@
  QVariant AccountsService::getUserProperty(const QString &interface,
                                            const QString &property)
+ {
--    if (!m_accountsserviceIface.isValid())
--        return QVariant();
      QDBusInterface iface (
                  "org.freedesktop.Accounts",
@@ -133,13 +129,11 @@
                  "org.freedesktop.DBus.Properties",
                  m_systemBusConnection,
                  this);
--    if (iface.isValid()) {
--        // The value needs to be carefully wrapped
--        iface.call("Set",
--                   interface,
--                   property,
--                   QVariant::fromValue(QDBusVariant(value)));
--    }
++    // The value needs to be carefully wrapped
++    iface.call("Set",
++               interface,
++               property,
++               QVariant::fromValue(QDBusVariant(value)));
+ }
  void AccountsService::customSetUserProperty(const QString &method,
@@ -151,7 +145,5 @@
                            m_systemBusConnection,
                            this);
--    if (iface.isValid())
--        iface.call(method, value);
--
++    iface.call(method, value);
+ }