Merge lp:~brian.curtin/ubuntuone-control-panel/windows-symlink into lp:ubuntuone-control-panel

[Brian Curtin]

- Made the creation of symlinks a separated test case so it can be skipped on Windows.

Add a platform check before trying to use os.symlink on Windows.

This is a clean version of https://code.launchpad.net/~brian.curtin/ubuntuone-control-panel/no-symlinks-on-windows/+merge/98736 which got polluted with several other changes.

[Natalia Bidart (nataliabidart)]

Looks great!

review: Approve

[Roberto Alsina (ralsina)]

+1

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~brian.curtin/ubuntuone-control-panel/windows-symlink into lp:ubuntuone-control-panel failed. Below is the output from the failed tests.

*** Running test suite for ubuntuone/controlpanel ***
ubuntuone.controlpanel.utils.tests.test_utils
  ExceptionHandlingTestCase
    test_exception_to_error_dict ... [OK]
    test_failure_to_error_dict ... [OK]
  GetDataFileTestCase
    test_get_data_file ... [OK]
  GetProjectDirTestCase
    test_get_project_dir_none_exists ... [OK]
    test_get_project_dir_relative ... [OK]
  GetProjectDirWithConstantsTestCase
    test_get_project_dir ... [OK]
    test_get_project_dir_none_exists ... [OK]
    test_get_project_dir_relative ... [OK]
ubuntuone.controlpanel.tests
  TestCase
    runTest ... [OK]
ubuntuone.controlpanel.utils.tests.test_linux
  AutoupdaterTestCase
    test_are_updates_present ... [OK]
    test_perform_update ... [OK]
  DefaultFoldersTestCase
    test_default_folders_bad_encoding ... [OK]
    test_default_folders_empty_file ... [OK]
    test_default_folders_non_ascii ... [OK]
    test_default_folders_not_file ... [OK]
    test_default_folders_only_comments ... [OK]
    test_default_folders_parsed ... [OK]
    test_default_folders_syntax_error ... [OK]
ubuntuone.controlpanel.tests
  TestCase
    runTest ... [OK]
ubuntuone.controlpanel.tests.test_replication_client
  ReplicationsTestCase
    test_exclude ... [OK]
    test_exclude_name_in_exclusions ... [OK]
    test_exclude_name_not_in_replications ... [OK]
    test_get_exclusions ... [OK]
    test_get_replications ... [OK]
    test_no_pairing_record ... [OK]
    test_replicate ... [OK]
    test_replicate_name_not_in_exclusions ... [OK]
    test_replicate_name_not_in_replications ... [OK]
ubuntuone.controlpanel.tests
  TestCase
    runTest ... [OK]
ubuntuone.controlpanel.tests.test_sd_client
  AutoconnectTestCase
    test_disable ... [OK]
    test_disable_throws_an_error ... ...

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_folders.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_folders.py	2012-03-19 20:51:26 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_folders.py	2012-03-23 14:10:24 +0000
@@ -26,6 +26,7 @@
 from PyQt4 import QtGui
 from twisted.internet import defer
 from ubuntuone.devtools.handlers import MementoHandler
+from ubuntuone.devtools.testcases import skipIfOS
 
 from ubuntuone.controlpanel.tests import helper_fail
 from ubuntuone.controlpanel.gui.tests import (
@@ -694,10 +695,6 @@
         empty_dir = os.path.join(dir_path, 'empty')
         os.mkdir(empty_dir)
 
-        # add a symlink to confirm those are avoided
-        a_link = os.path.join(dir_path, 'some_link')
-        os.symlink(a_file, a_link)
-
         return total_size
 
 
@@ -733,6 +730,28 @@
         self.assertRaises(Queue.Empty, self.queue.get, block=True, timeout=0.5)
 
 
+@skipIfOS("win32", "Windows does not easily support symlinks")
+class CalculateSizeWithSymlinksTestCase(BaseLocalFoldersTestCase):
+    """Test suite for the CalculateSize thread implementation."""
+
+    def build_test_dir(self, dir_path):
+        """Build a testing directory hierarchy."""
+        total_size = super(CalculateSizeWithSymlinksTestCase,
+                           self).build_test_dir(dir_path)
+
+        a_file = os.path.join(dir_path, 'to_be_symlinked')
+        with open(a_file, 'wb') as f:
+            f.write('y' * 5000)
+
+        total_size += os.path.getsize(a_file)
+
+        # add a symlink to confirm those are avoided
+        a_link = os.path.join(dir_path, 'some_link')
+        os.symlink(a_file, a_link)
+
+        return total_size
+
+
 class FakedCalculateSize(object):
     """A faked CalculateSize thread."""