Merge lp:~mandel/ubuntuone-client/darwin-inhibitor into lp:ubuntuone-client

[Manuel de la Peña]

- Ensure that the inhibitor does return self in the inhibit method (LP: #1017922)

- Ensure that the inhibitor does return self in the inhibit method (LP: #1017922)

[Roberto Alsina (ralsina)]

+1 code review

review: Approve

[Diego Sarmentero (diegosarmentero)]

+1 tests

review: Approve

[Diego Sarmentero (diegosarmentero)]

and code review :P

=== added file 'tests/platform/session/test_common.py'
--- tests/platform/session/test_common.py	1970-01-01 00:00:00 +0000
+++ tests/platform/session/test_common.py	2012-06-26 17:49:28 +0000
@@ -0,0 +1,46 @@
+#
+# Copyright 2011-2012 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL.  If you modify
+# file(s) with this exception, you may extend this exception to your
+# version of the file(s), but you are not obligated to do so.  If you
+# do not wish to do so, delete this exception statement from your
+# version.  If you delete this exception statement from all source
+# files in the program, then also delete it here.
+"""Inhibitor tests for darwin."""
+
+from twisted.internet import defer
+from twisted.trial.unittest import TestCase
+
+from ubuntuone.devtools.testcases import skipIfOS
+from ubuntuone.platform.session import Inhibitor, INHIBIT_LOGOUT_SUSPEND
+
+
+@skipIfOS('linux2', 'Ignored becuase it requires a DBusTestCases.')
+class InhibitorTestCase(TestCase):
+    """Test the inhibitor class."""
+
+    @defer.inlineCallbacks
+    def test_inihibit_returns_self(self):
+        inhibitor = Inhibitor()
+        result = yield inhibitor.inhibit(INHIBIT_LOGOUT_SUSPEND, 'test')
+        self.assertEqual(inhibitor, result)
+

=== modified file 'tests/platform/session/test_linux.py'
--- tests/platform/session/test_linux.py	2012-04-27 19:30:11 +0000
+++ tests/platform/session/test_linux.py	2012-06-26 17:49:28 +0000
@@ -126,7 +126,8 @@
                                              session.SESSION_MANAGER_BUSNAME,
                                              session.SESSION_MANAGER_PATH,
                                              FakeGnomeSessionManagerInhibitor)
-        yield session.inhibit_logout_suspend("fake reason")
+        inhibit_result = yield session.inhibit_logout_suspend("fake reason")
+        self.assertNotEqual(None, inhibit_result)
         result = fakeinhibitor.IsInhibited(session.INHIBIT_LOGGING_OUT)
         self.assertTrue(result)
         result = fakeinhibitor.IsInhibited(session.INHIBIT_SUSPENDING_COMPUTER)

=== modified file 'ubuntuone/platform/session/darwin.py'
--- ubuntuone/platform/session/darwin.py	2012-05-16 12:52:13 +0000
+++ ubuntuone/platform/session/darwin.py	2012-06-26 17:49:28 +0000
@@ -36,7 +36,7 @@
 
     def inhibit(self, flags, reason):
         """Inhibit some events with a given reason."""
-        return defer.succeed(None)
+        return defer.succeed(self)
 
     def cancel(self):
         """Cancel the inhibition for the current cookie."""

=== modified file 'ubuntuone/platform/session/windows.py'
--- ubuntuone/platform/session/windows.py	2012-04-27 19:30:11 +0000
+++ ubuntuone/platform/session/windows.py	2012-06-26 17:49:28 +0000
@@ -36,7 +36,7 @@
 
     def inhibit(self, flags, reason):
         """Inhibit some events with a given reason."""
-        return defer.succeed(None)
+        return defer.succeed(self)
 
     def cancel(self):
         """Cancel the inhibition for the current cookie."""