[gnome-settings-daemon] power: More fixes for test_sleep_inhibition

[Bastien Nocera <hadess src gnome org>]

commit f4fd9f35307f36d4c2279c3c76999ad969d30057
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Jan 22 12:16:41 2013 +0100

    power: More fixes for test_sleep_inhibition
    
    The idle-delay was too low for us to ever go to dim,
    the "check_no_idle" was misnamed (it checked for no dim), and
    broken (expected a space before the debug message).

 plugins/power/test.py |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/plugins/power/test.py b/plugins/power/test.py
index 8b51e78..ea7b6cf 100755
--- a/plugins/power/test.py
+++ b/plugins/power/test.py
@@ -138,15 +138,15 @@ class PowerPluginTest(gsdtestcase.GSDTestCase):
             self.assertFalse(b' Suspend' in log, 'unexpected Suspend request')
             self.assertFalse(b' Hibernate' in log, 'unexpected Hibernate request')
 
-    def check_no_idle(self, seconds):
-        '''Check that no idle mode is set in the given time'''
+    def check_no_dim(self, seconds):
+        '''Check that mode is not set to dim in the given time'''
 
         # wait for specified time to ensure it didn't do anything
         time.sleep(seconds)
         # check that we don't dim
         log = self.plugin_log.read()
         if log:
-            self.assertFalse(b' Doing a state transition: dim' in log, 'unexpected dim request')
+            self.assertFalse(b'Doing a state transition: dim' in log, 'unexpected dim request')
 
     def check_dim(self, timeout):
         '''Check that mode is set to dim in the given time'''
@@ -299,7 +299,9 @@ class PowerPluginTest(gsdtestcase.GSDTestCase):
     def test_sleep_inhibition(self):
         '''Does not sleep under idle inhibition'''
 
-        self.settings_session['idle-delay'] = 2
+        idle_delay = round(gsdpowerconstants.MINIMUM_IDLE_DIM_DELAY / gsdpowerconstants.IDLE_DELAY_TO_IDLE_DIM_MULTIPLIER)
+
+        self.settings_session['idle-delay'] = idle_delay
         self.settings_gsd_power['sleep-inactive-battery-timeout'] = 5
         self.settings_gsd_power['sleep-inactive-battery-type'] = 'suspend'
 
@@ -307,8 +309,8 @@ class PowerPluginTest(gsdtestcase.GSDTestCase):
         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))
-        self.check_no_suspend(7)
-        self.check_no_idle(0)
+        self.check_no_suspend(idle_delay + 2)
+        self.check_no_dim(0)
 
         # Check that we didn't go to idle either
         obj_session_presence = self.session_bus_con.get_object(