Merge lp:~brian.curtin/ubuntuone-control-panel/jenkins-fix into lp:ubuntuone-control-panel

[Brian Curtin]

- Add skipIfJenkins decorator to two tests which only fail on the Jenkins setup

Use the new Jenkins skip decorator to skip two tests that fail due to permissions on the Windows jenkins machine.

[Manuel de la Peña (mandel)]

Great! lets get those tests out for jenkins.

review: Approve

[lp:~brian.curtin/ubuntuone-control-panel/jenkins-fix]

327. By Brian Curtin on 2012-05-16

- Add skipIfJenkins decorator to two tests which only fail on the Jenkins setup

=== modified file 'ubuntuone/controlpanel/utils/tests/test_windows.py'
--- ubuntuone/controlpanel/utils/tests/test_windows.py	2012-04-05 14:52:55 +0000
+++ ubuntuone/controlpanel/utils/tests/test_windows.py	2012-05-16 14:05:24 +0000
@@ -23,6 +23,7 @@
 
 from ubuntuone.controlpanel import utils
 from ubuntuone.controlpanel.tests import TestCase
+from ubuntuone.devtools.testcases import skipIfJenkins
 
 # let me use protected methods
 # pylint: disable=W0212
@@ -206,6 +207,7 @@
 class DefaultFoldersTestCase(TestCase):
     """Test the default_folders method."""
 
+    @skipIfJenkins("win32", "Fails due to Jenkins setup on Windows")
     def test_special_folders(self, names=None):
         """Test that default_folders does the right thing."""
         folders = utils.default_folders()
@@ -224,6 +226,7 @@
 
         self.assertEqual(sorted(folders), sorted(expected))
 
+    @skipIfJenkins("win32", "Fails due to Jenkins setup on Windows")
     def test_special_folders_with_error(self):
         """Test that default_folders handles errors."""
         failing_name = 'MYVIDEO'