Merge lp:~diegosarmentero/ubuntuone-client/refactor-session into lp:ubuntuone-client

[Diego Sarmentero]

- Refactor platform/session (LP: #989132).

[lp:~diegosarmentero/ubuntuone-client/refactor-session]

1231. By Diego Sarmentero on 2012-04-27

Fixing run-tests.bat

[dobey (dobey)]

review: Approve

[Manuel de la Peña (mandel)]

Great, moving to a diff platform :)

review: Approve

=== modified file 'run-tests.bat'
--- run-tests.bat	2012-04-20 14:43:29 +0000
+++ run-tests.bat	2012-04-27 19:41:18 +0000
@@ -74,7 +74,7 @@
 COPY windows\clientdefs.py ubuntuone\clientdefs.py
 COPY windows\logging.conf data\logging.conf
 :: execute the tests with a number of ignored linux only modules
-"%PYTHONEXEPATH%" "%TRIALPATH%" --reactor=twisted -c -p tests\platform\linux %PARAMS% tests
+"%PYTHONEXEPATH%" "%TRIALPATH%" --reactor=twisted -c -p tests\platform\linux -i test_linux.py %PARAMS% tests
 
 IF %SKIPLINT% == 1 (
     ECHO Skipping style checks

=== added directory 'tests/platform/session'
=== added file 'tests/platform/session/__init__.py'
--- tests/platform/session/__init__.py	1970-01-01 00:00:00 +0000
+++ tests/platform/session/__init__.py	2012-04-27 19:41:18 +0000
@@ -0,0 +1,27 @@
+# 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.
+"""Platform/Session test code."""

=== renamed file 'tests/platform/linux/test_session.py' => 'tests/platform/session/test_linux.py'
--- tests/platform/linux/test_session.py	2012-04-09 20:07:05 +0000
+++ tests/platform/session/test_linux.py	2012-04-27 19:41:18 +0000
@@ -37,7 +37,7 @@
 from twisted.internet.defer import inlineCallbacks
 from ubuntuone.devtools.testcases.dbus import DBusTestCase
 
-from ubuntuone.platform.linux import session
+from ubuntuone.platform import session
 
 INHIBIT_ALL = (session.INHIBIT_LOGGING_OUT |
                session.INHIBIT_USER_SWITCHING |

=== added directory 'ubuntuone/platform/session'
=== renamed file 'ubuntuone/platform/session.py' => 'ubuntuone/platform/session/__init__.py'
--- ubuntuone/platform/session.py	2012-04-09 20:07:05 +0000
+++ ubuntuone/platform/session/__init__.py	2012-04-27 19:41:18 +0000
@@ -39,11 +39,11 @@
 
 
 if sys.platform == "win32":
-    from ubuntuone.platform.windows import session
-    source = session
+    from ubuntuone.platform.session import windows
+    source = windows
 else:
-    from ubuntuone.platform.linux import session
-    source = session
+    from ubuntuone.platform.session import linux
+    source = linux
     SESSION_MANAGER_BUSNAME = source.SESSION_MANAGER_BUSNAME
     SESSION_MANAGER_IFACE = source.SESSION_MANAGER_IFACE
     SESSION_MANAGER_PATH = source.SESSION_MANAGER_PATH

=== renamed file 'ubuntuone/platform/linux/session.py' => 'ubuntuone/platform/session/linux.py'
--- ubuntuone/platform/linux/session.py	2012-04-09 20:07:05 +0000
+++ ubuntuone/platform/session/linux.py	2012-04-27 19:41:18 +0000
@@ -1,6 +1,4 @@
-# ubuntuone.platform.linux.session
-#
-# Author: Alejandro J. Cura <[e-mail]>
+# -*- coding: utf-8 *-*
 #
 # Copyright 2011-2012 Canonical Ltd.
 #
@@ -34,12 +32,6 @@
 
 from twisted.internet import defer
 
-INHIBIT_LOGGING_OUT = 1
-INHIBIT_USER_SWITCHING = 2
-INHIBIT_SUSPENDING_COMPUTER = 4
-INHIBIT_SESSION_IDLE = 8
-INHIBIT_LOGOUT_SUSPEND = INHIBIT_LOGGING_OUT | INHIBIT_SUSPENDING_COMPUTER
-
 SESSION_MANAGER_BUSNAME = "org.gnome.SessionManager"
 SESSION_MANAGER_IFACE = "org.gnome.SessionManager"
 SESSION_MANAGER_PATH = "/org/gnome/SessionManager"
@@ -82,8 +74,3 @@
                              reply_handler=lambda: d.callback(self),
                              error_handler=d.errback)
         return d
-
-
-def inhibit_logout_suspend(reason):
-    """Inhibit the suspend and logout. The result can be cancelled."""
-    return Inhibitor().inhibit(INHIBIT_LOGOUT_SUSPEND, reason)

=== renamed file 'ubuntuone/platform/windows/session.py' => 'ubuntuone/platform/session/windows.py'
--- ubuntuone/platform/windows/session.py	2012-04-09 20:07:05 +0000
+++ ubuntuone/platform/session/windows.py	2012-04-27 19:41:18 +0000
@@ -1,5 +1,4 @@
-#
-# Author: Alejandro J. Cura <[e-mail]>
+# -*- coding: utf-8 *-*
 #
 # Copyright 2011-2012 Canonical Ltd.
 #
@@ -31,12 +30,6 @@
 
 from twisted.internet import defer
 
-INHIBIT_LOGGING_OUT = 1
-INHIBIT_USER_SWITCHING = 2
-INHIBIT_SUSPENDING_COMPUTER = 4
-INHIBIT_SESSION_IDLE = 8
-INHIBIT_LOGOUT_SUSPEND = INHIBIT_LOGGING_OUT | INHIBIT_SUSPENDING_COMPUTER
-
 
 class Inhibitor(object):
     """An object representing an inhibition, that can be cancelled."""
@@ -48,8 +41,3 @@
     def cancel(self):
         """Cancel the inhibition for the current cookie."""
         return defer.succeed(None)
-
-
-def inhibit_logout_suspend(reason):
-    """Inhibit the suspend and logout. The result can be cancelled."""
-    return Inhibitor().inhibit(INHIBIT_LOGOUT_SUSPEND, reason)

=== modified file 'ubuntuone/platform/windows/__init__.py'
--- ubuntuone/platform/windows/__init__.py	2012-04-09 20:07:05 +0000
+++ ubuntuone/platform/windows/__init__.py	2012-04-27 19:41:18 +0000
@@ -44,7 +44,6 @@
 import messaging
 import notification
 import os_helper
-import session
 
 from ubuntuone.platform.windows.os_helper import (
     access,