Merge lp:~brian.curtin/ubuntuone-dev-tools/jenkins-skipping into lp:ubuntuone-dev-tools

[Brian Curtin]

- Add a skip decorator to check if we are running on Jenkins

Add skipping for Jenkins, mostly for a few Windows tests we need to skip while running on the Jenkins machine.

[Roberto Alsina (ralsina)]

review: Approve

[Manuel de la Peña (mandel)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~brian.curtin/ubuntuone-dev-tools/jenkins-skipping into lp:ubuntuone-dev-tools failed. Below is the output from the failed tests.

ubuntuone.devtools.testing.tests.test_txwebserver
  MultipleWebServersTestCase
    test_multiple_requests ... [OK]
    test_single_request ... [OK]
twisted.trial.unittest
  TestCase
    runTest ... [OK]
ubuntuone.devtools.testing.tests.test_txwebserver
  WebServerTestCase
    test_get_iri ... [OK]
    test_get_port ... [OK]
    test_multiple_requests ... [OK]
    test_single_request ... [OK]
ubuntuone.devtools.testcases
  BaseTestCase
    runTest ... [OK]
ubuntuone.devtools.services.tests.test_squid
  EnvironTestCase
    test_delete_proxy_settings_present ... [OK]
    test_retrieve_proxy_settings ... [OK]
    test_store_settings ... [OK]
  PathsTestCase
    test_get_auth_temp_path ... [OK]
    test_get_basedir_missing ... [OK]
    test_get_basedir_present ... [OK]
    test_get_spool_temp_path_missing ... [OK]
    test_get_spool_temp_path_present ... [OK]
    test_get_squid_temp_path_missing ... [OK]
    test_get_squid_temp_path_present ... [OK]
  SquidRunnerInitTestCase
    test_htpasswd_missing ... [OK]
    test_squid_missing ... [OK]
  SquidRunnerTestCase
    test_generate_auth_file ... [OK]
    test_generate_config_file ... [OK]
    test_generate_swap ... [OK]
    test_start_error ... [OK]
ubuntuone.devtools.testcases.dbus
  DBusTestCase
    runTest ... [OK]
ubuntuone.devtools.services.tests.test_dbus
  TestWithDBus
    test_config_file_path ... [OK]
    test_dbus_session_is_running ... [OK]
ubuntuone.devtools.services.tests.test_squid_linux
  SquidLinuxTestCase
    test_format_config_path ... [OK]
    test_get_auth_process ... [OK]
    test_get_auth_process_3 ... [OK]
    test_kill_squid ... [OK]
twisted.trial.unittest
  TestCa...

[lp:~brian.curtin/ubuntuone-dev-tools/jenkins-skipping]

72. By Brian Curtin on 2012-05-14

Fix lint - added extra blank line...

=== modified file 'ubuntuone/devtools/testcases/__init__.py'
--- ubuntuone/devtools/testcases/__init__.py	2012-03-30 17:44:03 +0000
+++ ubuntuone/devtools/testcases/__init__.py	2012-05-14 14:32:19 +0000
@@ -113,6 +113,15 @@
     return _id
 
 
+def skipIfJenkins(current_os, reason):
+    """Skip test for a particular os or lists of them
+       when running on Jenkins."""
+    if os.getenv("JENKINS", False) and (sys.platform in current_os or
+                                        sys.platform == current_os):
+        return skipTest(reason)
+    return _id
+
+
 # pylint: enable=C0103
 
 

=== modified file 'ubuntuone/devtools/tests/test_decorators.py'
--- ubuntuone/devtools/tests/test_decorators.py	2012-03-30 17:44:03 +0000
+++ ubuntuone/devtools/tests/test_decorators.py	2012-05-14 14:32:19 +0000
@@ -29,6 +29,7 @@
 # version.  If you delete this exception statement from all source
 # files in the program, then also delete it here.
 """Test the skip decorators."""
+import os
 import sys
 
 from twisted.trial.runner import LoggedSuite
@@ -48,6 +49,9 @@
 
     def test_skip_decorators(self):
         """Test the decorators that skip tests."""
+        new_getenv = lambda *args: True
+        self.patch(os, "getenv", new_getenv)
+
         operations_table = (
             (testcase.skipIf,
                 (False, "False condition"),
@@ -58,18 +62,22 @@
             (testcase.skipIfNotOS,
                 (sys.platform, "skipIfNot this platform"),
                 (OTHER_PLATFORM[sys.platform],
-                    "skipIfNot other platform")))
+                    "skipIfNot other platform")),
+            (testcase.skipIfJenkins,
+                (OTHER_PLATFORM[sys.platform],
+                    "skipIfJenkins other platform"),
+                (sys.platform, "skipIfJenkins this platform")),)
         for deco, dont_skip, do_skip in operations_table:
 
             class Foo(BaseTestCase):
                 """Dummy test case used for the decorators testing."""
 
-                @deco(do_skip[0], do_skip[1])
+                @deco(*do_skip)
                 def test_skip(self):
                     """Test to skip."""
                     pass
 
-                @deco(dont_skip[0], dont_skip[1])
+                @deco(*dont_skip)
                 def test_dont_skip(self):
                     """Test not to skip."""
                     pass