[gnome-settings-daemon] power: Fix D-Bus proxy errors in test

[Bastien Nocera <hadess src gnome org>]

commit caa177a7f2f58fc74b2f52ef2eeeced9f320d405
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Apr 11 11:40:24 2017 +0200

    power: Fix D-Bus proxy errors in test
    
    Despite the object already having an object path associated, we
    apparently need to pass it again to D-Bus calls. This fixes errors such
    as:
    DBusException: org.freedesktop.DBus.Error.UnknownMethod: No such interface '(null)' on object at path 
/org/gnome/SessionManager
    
    when calling "Inhibit" or "Uninhibit".

 plugins/power/test.py |   36 ++++++++++++++++++++++++------------
 1 files changed, 24 insertions(+), 12 deletions(-)
---
diff --git a/plugins/power/test.py b/plugins/power/test.py
index a87100d..be98af7 100755
--- a/plugins/power/test.py
+++ b/plugins/power/test.py
@@ -416,7 +416,8 @@ class PowerPluginTest(gsdtestcase.GSDTestCase):
         # create suspend inhibitor which should have no effect on the idle
         inhibit_id = self.obj_session_mgr.Inhibit(
             'testsuite', dbus.UInt32(0), 'for testing',
-            dbus.UInt32(gsdpowerenums.GSM_INHIBITOR_FLAG_SUSPEND))
+            dbus.UInt32(gsdpowerenums.GSM_INHIBITOR_FLAG_SUSPEND),
+            dbus_interface='org.gnome.SessionManager')
 
         self.obj_screensaver.SetActive(True)
         self.assertTrue(self.obj_screensaver.GetActive(), 'screensaver not turned on')
@@ -438,7 +439,8 @@ class PowerPluginTest(gsdtestcase.GSDTestCase):
         self.check_blank(10)
 
         # Drop inhibitor
-        self.obj_session_mgr.Uninhibit(dbus.UInt32(inhibit_id))
+        self.obj_session_mgr.Uninhibit(dbus.UInt32(inhibit_id),
+                dbus_interface='org.gnome.SessionManager')
 
     def test_session_idle_delay(self):
         '''verify that session idle delay works as expected when changed'''
@@ -530,14 +532,16 @@ class PowerPluginTest(gsdtestcase.GSDTestCase):
         # create inhibitor
         inhibit_id = self.obj_session_mgr.Inhibit(
             'testsuite', dbus.UInt32(0), 'for testing',
-            dbus.UInt32(gsdpowerenums.GSM_INHIBITOR_FLAG_IDLE | gsdpowerenums.GSM_INHIBITOR_FLAG_SUSPEND))
+            dbus.UInt32(gsdpowerenums.GSM_INHIBITOR_FLAG_IDLE | gsdpowerenums.GSM_INHIBITOR_FLAG_SUSPEND),
+            dbus_interface='org.gnome.SessionManager')
         self.check_no_suspend(idle_delay + 2)
         self.check_no_dim(0)
 
         # Check that we didn't go to idle either
         self.assertEqual(self.get_status(), gsdpowerenums.GSM_PRESENCE_STATUS_AVAILABLE)
 
-        self.obj_session_mgr.Uninhibit(dbus.UInt32(inhibit_id))
+        self.obj_session_mgr.Uninhibit(dbus.UInt32(inhibit_id),
+                dbus_interface='org.gnome.SessionManager')
 
     def test_lock_on_lid_close(self):
         '''Check that we do lock on lid closing, if the machine will not suspend'''
@@ -547,7 +551,8 @@ class PowerPluginTest(gsdtestcase.GSDTestCase):
         # create inhibitor
         inhibit_id = self.obj_session_mgr.Inhibit(
             'testsuite', dbus.UInt32(0), 'for testing',
-            dbus.UInt32(gsdpowerenums.GSM_INHIBITOR_FLAG_SUSPEND))
+            dbus.UInt32(gsdpowerenums.GSM_INHIBITOR_FLAG_SUSPEND),
+            dbus_interface='org.gnome.SessionManager')
 
         # Close the lid
         self.obj_upower.Set('org.freedesktop.UPower', 'LidIsClosed', True)
@@ -559,7 +564,8 @@ class PowerPluginTest(gsdtestcase.GSDTestCase):
         self.check_blank(2)
 
         # Drop the inhibit and see whether we suspend
-        self.obj_session_mgr.Uninhibit(dbus.UInt32(inhibit_id))
+        self.obj_session_mgr.Uninhibit(dbus.UInt32(inhibit_id),
+                dbus_interface='org.gnome.SessionManager')
         # At this point logind should suspend for us
         self.settings_screensaver['lock-enabled'] = False
 
@@ -569,7 +575,8 @@ class PowerPluginTest(gsdtestcase.GSDTestCase):
         # create inhibitor
         inhibit_id = self.obj_session_mgr.Inhibit(
             'testsuite', dbus.UInt32(0), 'for testing',
-            dbus.UInt32(gsdpowerenums.GSM_INHIBITOR_FLAG_SUSPEND))
+            dbus.UInt32(gsdpowerenums.GSM_INHIBITOR_FLAG_SUSPEND),
+            dbus_interface='org.gnome.SessionManager')
 
         # Close the lid
         self.obj_upower.Set('org.freedesktop.UPower', 'LidIsClosed', True)
@@ -579,7 +586,8 @@ class PowerPluginTest(gsdtestcase.GSDTestCase):
         self.check_blank(4)
 
         # Drop the inhibit and see whether we suspend
-        self.obj_session_mgr.Uninhibit(dbus.UInt32(inhibit_id))
+        self.obj_session_mgr.Uninhibit(dbus.UInt32(inhibit_id),
+                dbus_interface='org.gnome.SessionManager')
         # At this point logind should suspend for us
 
     def test_unblank_on_lid_open(self):
@@ -588,7 +596,8 @@ class PowerPluginTest(gsdtestcase.GSDTestCase):
         # create inhibitor
         inhibit_id = self.obj_session_mgr.Inhibit(
             'testsuite', dbus.UInt32(0), 'for testing',
-            dbus.UInt32(gsdpowerenums.GSM_INHIBITOR_FLAG_SUSPEND))
+            dbus.UInt32(gsdpowerenums.GSM_INHIBITOR_FLAG_SUSPEND),
+            dbus_interface='org.gnome.SessionManager')
 
         # Close the lid
         self.obj_upower.Set('org.freedesktop.UPower', 'LidIsClosed', True)
@@ -605,7 +614,8 @@ class PowerPluginTest(gsdtestcase.GSDTestCase):
         self.check_unblank(2)
 
         # Drop the inhibit
-        self.obj_session_mgr.Uninhibit(dbus.UInt32(inhibit_id))
+        self.obj_session_mgr.Uninhibit(dbus.UInt32(inhibit_id),
+                dbus_interface='org.gnome.SessionManager')
 
     def test_dim(self):
         '''Check that we do go to dim'''
@@ -847,12 +857,14 @@ class PowerPluginTest(gsdtestcase.GSDTestCase):
         # create suspend inhibitor which should stop us logging out
         inhibit_id = self.obj_session_mgr.Inhibit(
             'testsuite', dbus.UInt32(0), 'for testing',
-            dbus.UInt32(gsdpowerenums.GSM_INHIBITOR_FLAG_LOGOUT))
+            dbus.UInt32(gsdpowerenums.GSM_INHIBITOR_FLAG_LOGOUT),
+            dbus_interface='org.gnome.SessionManager')
 
         self.check_no_logout(idle_delay + 3)
 
         # Drop inhibitor
-        self.obj_session_mgr.Uninhibit(dbus.UInt32(inhibit_id))
+        self.obj_session_mgr.Uninhibit(dbus.UInt32(inhibit_id),
+                dbus_interface='org.gnome.SessionManager')
 
     def disabled_test_unindle_on_ac_plug(self):
         idle_delay = round(gsdpowerconstants.MINIMUM_IDLE_DIM_DELAY / 
gsdpowerconstants.IDLE_DELAY_TO_IDLE_DIM_MULTIPLIER)