[gnome-settings-daemon] power tests: Fix check_*_blank() methods

[Martin Pitt <martinpitt src gnome org>]

commit 4e315ff913b5a616b73d1db0a3e8961d8bf24b77
Author: Martin Pitt <martinpitt gnome org>
Date:   Fri Jan 18 17:22:50 2013 +0100

    power tests: Fix check_*_blank() methods
    
    You cannot read from self.plugin_log as this is a write-only file object.
    Rename that to plugin_log_write to be less confusing, and provide a readable
    self.plugin_log fd for using in tests.
    
    Update the check_*_blank() methods to use this, so that they actually work.

 plugins/power/test.py |   29 +++++++++++++----------------
 1 files changed, 13 insertions(+), 16 deletions(-)
---
diff --git a/plugins/power/test.py b/plugins/power/test.py
index 2e1cfdc..e94ea53 100755
--- a/plugins/power/test.py
+++ b/plugins/power/test.py
@@ -49,19 +49,22 @@ class PowerPluginTest(gsdtestcase.GSDTestCase):
         # start power plugin
         self.settings_gsd_power['active'] = False
         Gio.Settings.sync()
-        self.plugin_log = open(os.path.join(self.workdir, 'plugin_power.log'), 'wb')
+        self.plugin_log_write = open(os.path.join(self.workdir, 'plugin_power.log'), 'wb')
         # avoid painfully long delays of actions for tests
         env = os.environ.copy()
         env['GSD_ACTION_DELAY'] = '1'
         self.daemon = subprocess.Popen(
             [os.path.join(builddir, 'gsd-test-power')],
             # comment out this line if you want to see the logs in real time
-            stdout=self.plugin_log,
+            stdout=self.plugin_log_write,
             stderr=subprocess.STDOUT,
             env=env)
         # give it some time to settle down
         time.sleep(1)
 
+        # you can use this for reading the current daemon log in tests
+        self.plugin_log = open(self.plugin_log_write.name)
+
         # always start with zero idle time
         self.reset_idle_timer()
 
@@ -77,8 +80,9 @@ class PowerPluginTest(gsdtestcase.GSDTestCase):
 
         self.daemon.terminate()
         self.daemon.wait()
-        self.plugin_log.flush()
         self.plugin_log.close()
+        self.plugin_log_write.flush()
+        self.plugin_log_write.close()
 
         self.upowerd.terminate()
         self.upowerd.wait()
@@ -133,12 +137,9 @@ class PowerPluginTest(gsdtestcase.GSDTestCase):
             time.sleep(1)
             timeout -= 1
             # check that it requested blank
-            try:
-                log = self.plugin_log.read()
-            except IOError:
-                break
+            log = self.plugin_log.read()
 
-            if log and (b'TESTSUITE: Blanked screen' in log):
+            if 'TESTSUITE: Blanked screen' in log:
                 break
         else:
             self.fail('timed out waiting for blank')
@@ -153,12 +154,9 @@ class PowerPluginTest(gsdtestcase.GSDTestCase):
             time.sleep(1)
             timeout -= 1
             # check that it requested unblank
-            try:
-                log = self.plugin_log.read()
-            except IOError:
-                break
+            log = self.plugin_log.read()
 
-            if log and (b'TESTSUITE: Unblanked screen' in log):
+            if 'TESTSUITE: Unblanked screen' in log:
                 break
         else:
             self.fail('timed out waiting for unblank')
@@ -169,9 +167,8 @@ class PowerPluginTest(gsdtestcase.GSDTestCase):
         # wait for specified time to ensure it didn't blank
         time.sleep(seconds)
         # check that it did not blank
-        log = self.daemon.stdout.read()
-        if log:
-            self.assertFalse(b'TESTSUITE: Blanked screen' in log, 'unexpected blank request')
+        log = self.plugin_log.read()
+        self.assertFalse('TESTSUITE: Blanked screen' in log, 'unexpected blank request')
 
     def test_sleep_inactive_blank(self):
         '''screensaver/blank interaction'''