Merge lp:~dobey/ubuntuone-client/disable-inhibit into lp:ubuntuone-client

[dobey]

Dsable the session inhibitor to prevent bug #737620 from happening.

[lp:~dobey/ubuntuone-client/disable-inhibit]

1329. By dobey on 2012-10-01

Fix whitespace

[Roberto Alsina (ralsina)]

+1

review: Approve

[Alejandro J. Cura (alecu)]

Looks good

review: Approve

=== modified file 'tests/status/test_aggregator.py'
--- tests/status/test_aggregator.py	2012-09-26 20:20:51 +0000
+++ tests/status/test_aggregator.py	2012-10-01 15:53:44 +0000
@@ -39,6 +39,7 @@
 
 from contrib.testing.testcase import BaseTwistedTestCase
 from ubuntuone.devtools.handlers import MementoHandler
+from ubuntuone.devtools.testcases import skipTest
 from ubuntuone.status import aggregator
 from ubuntuone.status.notification import AbstractNotification
 from ubuntuone.status.messaging import AbstractMessaging
@@ -576,7 +577,6 @@
         """Initialize this test instance."""
         yield super(ProgressBarTestCase, self).setUp()
         self.patch(aggregator, "UbuntuOneLauncher", FakeLauncher)
-        self.patch(aggregator.session, "Inhibitor", FakeInhibitor)
         self.clock = PatchedClock()
         self.bar = aggregator.ProgressBar(clock=self.clock)
         self.addCleanup(self.bar.cleanup)
@@ -662,6 +662,7 @@
         self.assertFalse(self.bar.visible)
         self.assertFalse(self.bar.launcher.progress_visible)
 
+    @skipTest('Inhibitor is disabled to prevent bug #737620')
     @defer.inlineCallbacks
     def test_progress_made_inhibits_logout_suspend(self):
         """Suspend and logout are inhibited when the progressbar is shown."""
@@ -670,6 +671,7 @@
         inhibitor = yield self.bar.inhibitor_defer
         self.assertEqual(inhibitor.flags, expected)
 
+    @skipTest('Inhibitor is disabled to prevent bug #737620')
     @defer.inlineCallbacks
     def test_completed_uninhibits_logout_suspend(self):
         """Suspend and logout are uninhibited when all has completed."""
@@ -1291,7 +1293,6 @@
         self.patch(aggregator, "ToggleableNotification",
                    FakeNotificationSingleton())
         self.patch(aggregator, "UbuntuOneLauncher", FakeLauncher)
-        self.patch(aggregator.session, "Inhibitor", FakeInhibitor)
         clock = PatchedClock()
         self.status_frontend = aggregator.StatusFrontend(clock=clock)
         self.aggregator = self.status_frontend.aggregator

=== modified file 'ubuntuone/status/aggregator.py'
--- ubuntuone/status/aggregator.py	2012-09-26 20:20:51 +0000
+++ ubuntuone/status/aggregator.py	2012-10-01 15:53:44 +0000
@@ -43,7 +43,6 @@
 from ubuntuone.status.logger import logger
 from ubuntuone.platform import (
     notification,
-    session,
     sync_menu
 )
 from ubuntuone.platform.messaging import Messaging
@@ -533,7 +532,6 @@
     progress = 0.0
     updates_delay = 0.1
     timer = None
-    inhibitor_defer = None
 
     def __init__(self, clock=reactor):
         """Initialize this instance."""
@@ -563,9 +561,6 @@
             self.visible = True
             self.launcher.show_progressbar()
             logger.debug("progressbar shown")
-            if self.inhibitor_defer is None:
-                self.inhibitor_defer = session.inhibit_logout_suspend(
-                                                         FILE_SYNC_IN_PROGRESS)
         if not self.timer:
             self.timer = Timer(self.updates_delay, clock=self.clock)
             self.timer.addCallback(self._timeout)
@@ -576,14 +571,6 @@
         self.visible = False
         self.launcher.hide_progressbar()
         logger.debug("progressbar hidden")
-        if self.inhibitor_defer is not None:
-
-            def inhibitor_callback(inhibitor):
-                """The inhibitor was found, so cancel it."""
-                self.inhibitor_defer = None
-                return inhibitor.cancel()
-
-            self.inhibitor_defer.addCallback(inhibitor_callback)
 
 
 class FinalStatusBubble(object):