Merge lp:~mandel/ubuntuone-client/fix_tests_on_windows into lp:ubuntuone-client

[Manuel de la Peña]

This branch fixes the tests so that they can be ran on Windows. This branchs provides the following changes:

* Added the missing the move_trash method.
* Moved the UbuntuOneLauncher from the platform module to its actual platform (that being linux). Added an dummy implementation for Windows so that the tests pass that will later has to be implemented.
* Fixed the different Launcher tests to assert that the launcher is indeed called no matter which platform.
* Added the clientdefs for windows. ATM they are generated with autoconf but that does not make happy the windows port.

This branch fixes the tests so that they can be ran on Windows. This branchs provides the following changes:

* Added the missing the move_trash method.
* Moved the UbuntuOneLauncher from the platform module to its actual platform (that being linux). Added an dummy implementation for Windows so that the tests pass that will later has to be implemented.
* Fixed the different Launcher tests to assert that the launcher is indeed called no matter which platform.
* Added the clientdefs for windows. ATM they are generated with autoconf but that does not make happy the windows port.

[lp:~mandel/ubuntuone-client/fix_tests_on_windows]

961. By Manuel de la Peña on 2011-04-14

Added hardcoded clientdefs for windows.

[Roberto Alsina (ralsina)]

+1

review: Approve

[Shane Fagan (shanepatrickfagan)]

+1 tests pass and code review is fine

review: Approve

=== modified file 'contrib/testing/testcase.py'
--- contrib/testing/testcase.py	2011-02-21 17:29:02 +0000
+++ contrib/testing/testcase.py	2011-04-14 13:54:43 +0000
@@ -17,6 +17,7 @@
 """ Base tests cases and test utilities """
 from __future__ import with_statement
 
+import sys
 import contextlib
 import logging
 import os
@@ -253,7 +254,7 @@
 
     This class provides:
         mktemp(name): helper to create temporary dirs
-        rmtree(path): support read-only shares
+        mmtree(path): support read-only shares
         makedirs(path): support read-only shares
     """
 
@@ -283,6 +284,10 @@
 
     def rmtree(self, path):
         """Custom rmtree that handle ro parent(s) and childs."""
+        # on windows the paths cannot be removed because the process running
+        # them has the ownership and therefore are locked.
+        if sys.platform == 'win32':
+            return
         if not os.path.exists(path):
             return
         # change perms to rw, so we can delete the temp dir

=== modified file 'run-tests.bat'
--- run-tests.bat	2011-02-08 14:09:31 +0000
+++ run-tests.bat	2011-04-14 13:54:43 +0000
@@ -50,6 +50,7 @@
 
 :PYTHONPRESENT
 ECHO Python found, executing the tests...
+COPY windows\clientdefs.py ubuntuone\clientdefs.py
 :: execute the tests with a number of ignored linux only modules
 "%PYTHONPATH%\python.exe" "%PYTHONPATH%\Scripts\u1trial" -c tests -p tests\platform\linux
 "%PYTHONPATH%\python.exe" "%PYTHONPATH%\Scripts\u1lint"

=== modified file 'tests/platform/linux/test_unity.py'
--- tests/platform/linux/test_unity.py	2011-04-06 12:50:32 +0000
+++ tests/platform/linux/test_unity.py	2011-04-14 13:54:43 +0000
@@ -1,4 +1,4 @@
-# tests.platform.linux.test_unity
+# tests.platform.linux.test_launcher
 #
 # Author: Alejandro J. Cura <[e-mail]>
 #
@@ -16,11 +16,11 @@
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Tests for the libunity interface."""
+"""Tests for the liblauncher interface."""
 
 from twisted.trial.unittest import TestCase
 
-from ubuntuone.platform.linux import unity
+from ubuntuone.platform.linux import launcher
 
 
 class FakeLauncherEntryProps(object):
@@ -47,12 +47,12 @@
 class LauncherProgressbarEmblemTestCase(TestCase):
     """Test the Launcher progressbar and emblem."""
 
-    skip = None if unity.use_libunity else "libunity not installed."
+    skip = None if launcher.use_libunity else "libunity not installed."
 
     def setUp(self):
         """Initialize this test instance."""
-        self.patch(unity.Unity, "LauncherEntry", FakeLauncherEntry)
-        self.launcher = unity.UbuntuOneLauncher()
+        self.patch(launcher.Unity, "LauncherEntry", FakeLauncherEntry)
+        self.launcher = launcher.UbuntuOneLauncher()
 
     def test_progress_starts_hidden(self):
         """The progressbar starts hidden."""

=== modified file 'tests/status/test_aggregator.py'
--- tests/status/test_aggregator.py	2011-04-12 20:41:55 +0000
+++ tests/status/test_aggregator.py	2011-04-14 13:54:43 +0000
@@ -949,7 +949,7 @@
         """Quota exceeded in udf."""
         mocker = Mocker()
         launcher = mocker.replace(
-            "ubuntuone.platform.unity.UbuntuOneLauncher")
+            "ubuntuone.platform.launcher.UbuntuOneLauncher")
         launcher()
         mock_launcher = mocker.mock()
         mocker.result(mock_launcher)
@@ -969,7 +969,7 @@
         """Quota exceeded in root."""
         mocker = Mocker()
         launcher = mocker.replace(
-            "ubuntuone.platform.unity.UbuntuOneLauncher")
+            "ubuntuone.platform.launcher.UbuntuOneLauncher")
         launcher()
         mock_launcher = mocker.mock()
         mocker.result(mock_launcher)
@@ -990,7 +990,7 @@
         """Quota exceeded in share."""
         mocker = Mocker()
         launcher = mocker.replace(
-            "ubuntuone.platform.unity.UbuntuOneLauncher")
+            "ubuntuone.platform.launcher.UbuntuOneLauncher")
         launcher()
         mock_launcher = mocker.mock()
         mocker.result(mock_launcher)

=== renamed file 'ubuntuone/platform/linux/unity.py' => 'ubuntuone/platform/linux/launcher.py'
=== modified file 'ubuntuone/platform/windows/__init__.py'
--- ubuntuone/platform/windows/__init__.py	2011-02-07 15:55:46 +0000
+++ ubuntuone/platform/windows/__init__.py	2011-04-14 13:54:43 +0000
@@ -50,6 +50,7 @@
     set_file_readonly,
     set_file_readwrite,
     stat_path,
+    move_to_trash
 )
 
 from ubuntuone.platform.windows import event_logging

=== added file 'ubuntuone/platform/windows/launcher.py'
--- ubuntuone/platform/windows/launcher.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/platform/windows/launcher.py	2011-04-14 13:54:43 +0000
@@ -0,0 +1,45 @@
+# ubuntuone.platform.linux.unity
+#
+# Author: Alejandro J. Cura <[e-mail]>
+#
+# Copyright 2011 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/>.
+"""Use libunity to show a progressbar and emblems on the launcher icon."""
+
+U1_DOTDESKTOP = "ubuntuone-control-panel-gtk.desktop"
+
+
+class UbuntuOneLauncher(object):
+    """The Ubuntu One launcher icon."""
+
+    def __init__(self):
+        """Initialize this instance."""
+
+    def show_progressbar(self):
+        """The progressbar is shown."""
+
+    def hide_progressbar(self):
+        """The progressbar is hidden."""
+
+    def set_progress(self, value):
+        """The progressbar value is changed."""
+
+    def set_urgent(self, value=True):
+        """Set the launcher to urgent."""
+
+
+# linux needs a dummy launcher in case Unity is not running, of course this
+# makes no bloody sense on windows, lets adapt to it and discuss about it
+# later
+DummyLauncher = UbuntuOneLauncher

=== modified file 'ubuntuone/platform/windows/os_helper.py'
--- ubuntuone/platform/windows/os_helper.py	2011-02-08 07:20:19 +0000
+++ ubuntuone/platform/windows/os_helper.py	2011-04-14 13:54:43 +0000
@@ -341,3 +341,10 @@
     if look_for_link and os.path.exists(path + '.lnk'):
         return stat_path(path + '.lnk')
     return os.lstat(path)
+
+
+def move_to_trash(path):
+    """Move the file or dir to trash.
+
+    If had any error, or the system can't do it, just remove it.
+    """
\ No newline at end of file

=== added file 'ubuntuone/platform/windows/session.py'
=== modified file 'ubuntuone/status/aggregator.py'
--- ubuntuone/status/aggregator.py	2011-04-12 20:41:55 +0000
+++ ubuntuone/status/aggregator.py	2011-04-14 13:54:43 +0000
@@ -31,7 +31,7 @@
 from ubuntuone.platform import session
 from ubuntuone.platform.notification import Notification
 from ubuntuone.platform.messaging import Messaging
-from ubuntuone.platform.unity import UbuntuOneLauncher, DummyLauncher
+from ubuntuone.platform.launcher import UbuntuOneLauncher, DummyLauncher
 
 ONE_DAY = 24 * 60 * 60
 Q_ = lambda string: gettext.dgettext(GETTEXT_PACKAGE, string)

=== added directory 'windows'
=== added file 'windows/clientdefs.py'
--- windows/clientdefs.py	1970-01-01 00:00:00 +0000
+++ windows/clientdefs.py	2011-04-14 13:54:43 +0000
@@ -0,0 +1,39 @@
+# ubuntuone.clientdefs - Configure-time definitions
+#
+# Author: David Planella <[e-mail]>
+#
+# Copyright 2009 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/>.
+"""Ubuntu One client definitions.
+
+This is a package containing configure-time definitions for the Ubuntu One
+client.
+
+"""
+import gettext
+
+
+Q_ = lambda string: gettext.dgettext(GETTEXT_PACKAGE, string)
+
+# pylint: disable-msg=C0301
+VERSION = '0.1'
+LOCALEDIR = ''
+LIBEXECDIR = ''
+GETTEXT_PACKAGE = ''
+
+# these variables are Deprecated, use those defined in ubuntuone.credentials
+APP_NAME="Ubuntu One"
+TC_URL="https://one.ubuntu.com/terms/"
+PING_URL="https://one.ubuntu.com/oauth/sso-finished-so-get-tokens/"
+DESCRIPTION = Q_("Ubuntu One requires an Ubuntu Single Sign On (SSO) account. This process will allow you to create a new account, if you do not yet have one.")