Set to use unittest2 library instead of unittest

This library backports all modern unittest features
to old versions of Python

diff --git a/jenkinsapi_tests/systests/base.py b/jenkinsapi_tests/systests/base.py
index 758ec86c6e5d2f97f12df12fd240570fb3a12b6a..e1cf133d8c5e9cf37c20d30a7ab3397ea59afee7 100644 (file)
--- a/jenkinsapi_tests/systests/base.py
+++ b/jenkinsapi_tests/systests/base.py
@@ -1,4 +1,4 @@
-import unittest
+import unittest2 as unittest
 import jenkinsapi_tests.systests
 from jenkinsapi_tests.systests.job_configs import EMPTY_JOB
 from jenkinsapi.jenkins import Jenkins

diff --git a/jenkinsapi_tests/systests/test_downstream_upstream.py b/jenkinsapi_tests/systests/test_downstream_upstream.py
index 0470632a3dc20baaa587f25c78fb2be57a28b145..e0e5fdf3c396e89beab99da04f4927bec2ac2d2d 100644 (file)
--- a/jenkinsapi_tests/systests/test_downstream_upstream.py
+++ b/jenkinsapi_tests/systests/test_downstream_upstream.py
@@ -3,7 +3,7 @@ System tests for `jenkinsapi.jenkins` module.
 '''
 import time
 import logging
-import unittest
+import unittest2 as unittest
 from jenkinsapi.custom_exceptions import NoBuildData
 from jenkinsapi_tests.systests.base import BaseSystemTest
 

diff --git a/jenkinsapi_tests/systests/test_executors.py b/jenkinsapi_tests/systests/test_executors.py
index b28906901cd8e8bbfeea960bc8a0396cf80c1917..479a1c2b70c6ec9f04c38769ab2967ebc0179f64 100644 (file)
--- a/jenkinsapi_tests/systests/test_executors.py
+++ b/jenkinsapi_tests/systests/test_executors.py
@@ -7,7 +7,7 @@ from jenkinsapi_tests.systests.job_configs import LONG_RUNNING_JOB
 from jenkinsapi_tests.test_utils.random_strings import random_string
 import logging
 import time
-import unittest
+import unittest2 as unittest
 
 
 log = logging.getLogger(__name__)
@@ -31,7 +31,7 @@ class TestNodes(BaseSystemTest):
         job = self.jenkins.create_job(job_name, LONG_RUNNING_JOB)
         ii = job.invoke(invoke_pre_check_delay=2)
         ii.block(until='not_queued')
-        
+
         if job.is_running() is False:
             time.sleep(1)
         executors = self.jenkins.get_executors(node_name)

diff --git a/jenkinsapi_tests/systests/test_invocation.py b/jenkinsapi_tests/systests/test_invocation.py
index a79ed36d411d784526a3bc21a8e7563ce606bd54..45f14d6f97e7aff5828270cb4e86c6a8533fbcfc 100644 (file)
--- a/jenkinsapi_tests/systests/test_invocation.py
+++ b/jenkinsapi_tests/systests/test_invocation.py
@@ -1,7 +1,7 @@
 '''
 System tests for `jenkinsapi.jenkins` module.
 '''
-import unittest
+import unittest2 as unittest
 import time
 from jenkinsapi.build import Build
 from jenkinsapi.invocation import Invocation

diff --git a/jenkinsapi_tests/systests/test_jenkins.py b/jenkinsapi_tests/systests/test_jenkins.py
index 92a44a0d9738422c76f3bb65c85b18ee7404fedd..daf93f82162d630b5d05c1724c8303420909856a 100644 (file)
--- a/jenkinsapi_tests/systests/test_jenkins.py
+++ b/jenkinsapi_tests/systests/test_jenkins.py
@@ -1,7 +1,7 @@
 '''
 System tests for `jenkinsapi.jenkins` module.
 '''
-import unittest
+import unittest2 as unittest
 from jenkinsapi.job import Job
 from jenkinsapi.invocation import Invocation
 from jenkinsapi_tests.systests.base import BaseSystemTest

diff --git a/jenkinsapi_tests/systests/test_jenkins_artifacts.py b/jenkinsapi_tests/systests/test_jenkins_artifacts.py
index 693f4f18f41d48abd88a5d6bacb94329f86734c8..4f13097fed0abd6cd51d3f1ccee079fc783886fa 100644 (file)
--- a/jenkinsapi_tests/systests/test_jenkins_artifacts.py
+++ b/jenkinsapi_tests/systests/test_jenkins_artifacts.py
@@ -7,7 +7,7 @@ import time
 import gzip
 import shutil
 import tempfile
-import unittest
+import unittest2 as unittest
 
 from jenkinsapi_tests.systests.base import BaseSystemTest
 from jenkinsapi_tests.systests.job_configs import JOB_WITH_ARTIFACTS

diff --git a/jenkinsapi_tests/systests/test_jenkins_matrix.py b/jenkinsapi_tests/systests/test_jenkins_matrix.py
index 3df8de68cc6fab406b24702556287ce833dd1e8b..e1536673a88419c99b7455094fbf7fbfc56b799f 100644 (file)
--- a/jenkinsapi_tests/systests/test_jenkins_matrix.py
+++ b/jenkinsapi_tests/systests/test_jenkins_matrix.py
@@ -3,7 +3,7 @@ System tests for `jenkinsapi.jenkins` module.
 '''
 import re
 import time
-import unittest
+import unittest2 as unittest
 
 from jenkinsapi_tests.systests.base import BaseSystemTest
 from jenkinsapi_tests.systests.job_configs import MATRIX_JOB

diff --git a/jenkinsapi_tests/systests/test_nodes.py b/jenkinsapi_tests/systests/test_nodes.py
index b12558925c3316af16e6585c624ad428bee3b048..13d0e8da4ee8ef7770547323341befc2775a8f0d 100644 (file)
--- a/jenkinsapi_tests/systests/test_nodes.py
+++ b/jenkinsapi_tests/systests/test_nodes.py
@@ -2,7 +2,7 @@
 System tests for `jenkinsapi.jenkins` module.
 '''
 import logging
-import unittest
+import unittest2 as unittest
 from jenkinsapi_tests.systests.base import BaseSystemTest
 from jenkinsapi_tests.test_utils.random_strings import random_string
 

diff --git a/jenkinsapi_tests/systests/test_parameterized_builds.py b/jenkinsapi_tests/systests/test_parameterized_builds.py
index 205fc783b5eb1e8e2b62b6ddf9396637e31502ce..adabbe173cadb8c7265c4ba3e3177dec1545680c 100644 (file)
--- a/jenkinsapi_tests/systests/test_parameterized_builds.py
+++ b/jenkinsapi_tests/systests/test_parameterized_builds.py
@@ -2,7 +2,7 @@
 System tests for `jenkinsapi.jenkins` module.
 '''
 import time
-import unittest
+import unittest2 as unittest
 from StringIO import StringIO
 from jenkinsapi_tests.systests.base import BaseSystemTest
 from jenkinsapi_tests.test_utils.random_strings import random_string

diff --git a/jenkinsapi_tests/systests/test_queue.py b/jenkinsapi_tests/systests/test_queue.py
index bb3d3f2b52c578e525346f888e15bfa13493bba7..e1ec2da95e647ed23367b63d39ce777d76f74307 100644 (file)
--- a/jenkinsapi_tests/systests/test_queue.py
+++ b/jenkinsapi_tests/systests/test_queue.py
@@ -3,7 +3,7 @@ System tests for `jenkinsapi.jenkins` module.
 '''
 import time
 import logging
-import unittest
+import unittest2 as unittest
 from jenkinsapi.queue import Queue
 from jenkinsapi_tests.systests.base import BaseSystemTest
 from jenkinsapi_tests.test_utils.random_strings import random_string

diff --git a/jenkinsapi_tests/systests/test_scm.py b/jenkinsapi_tests/systests/test_scm.py
index 3147fb07dda82990af46343ef3a25d864f455ecc..a979ec355b23e2c0b1b625bc6f5cefd2722caed6 100644 (file)
--- a/jenkinsapi_tests/systests/test_scm.py
+++ b/jenkinsapi_tests/systests/test_scm.py
@@ -1,7 +1,7 @@
 # '''
 # System tests for `jenkinsapi.jenkins` module.
 # '''
-# import unittest
+# import unittest2 as unittest
 # from jenkinsapi_tests.systests.base import BaseSystemTest
 # from jenkinsapi_tests.test_utils.random_strings import random_string
 # from jenkinsapi_tests.systests.job_configs import SCM_GIT_JOB

diff --git a/jenkinsapi_tests/systests/test_views.py b/jenkinsapi_tests/systests/test_views.py
index be9cfa9b5e20bfa59c178731327b7200865116aa..d4c830173fc0bb57ae24935c22b4f2ec351beee6 100644 (file)
--- a/jenkinsapi_tests/systests/test_views.py
+++ b/jenkinsapi_tests/systests/test_views.py
@@ -2,7 +2,7 @@
 System tests for `jenkinsapi.jenkins` module.
 '''
 import logging
-import unittest
+import unittest2 as unittest
 
 from jenkinsapi.view import View
 from jenkinsapi.views import Views

diff --git a/jenkinsapi_tests/unittests/test_build.py b/jenkinsapi_tests/unittests/test_build.py
index 0aa365adb4a6d63da6173e8896a5f60dc1341412..8e30f554b07cfe9d253cdd2f5a68b5c68842770e 100644 (file)
--- a/jenkinsapi_tests/unittests/test_build.py
+++ b/jenkinsapi_tests/unittests/test_build.py
@@ -1,6 +1,6 @@
 import pytz
 import mock
-import unittest
+import unittest2 as unittest
 import datetime
 
 from jenkinsapi.build import Build

diff --git a/jenkinsapi_tests/unittests/test_build_scm_git.py b/jenkinsapi_tests/unittests/test_build_scm_git.py
index 7983e5926b70a2ff0d44c231c93502b751def34c..b80984e779e93e8e4f4d1d378939399daf82bd43 100644 (file)
--- a/jenkinsapi_tests/unittests/test_build_scm_git.py
+++ b/jenkinsapi_tests/unittests/test_build_scm_git.py
@@ -1,5 +1,5 @@
 import mock
-import unittest
+import unittest2 as unittest
 from jenkinsapi.build import Build
 
 

diff --git a/jenkinsapi_tests/unittests/test_executors.py b/jenkinsapi_tests/unittests/test_executors.py
index 45159c498edca45f7456fb456aac7f1247dafada..402ed6ddc1a2e2a00e839fdf5af9b37b833f5950 100644 (file)
--- a/jenkinsapi_tests/unittests/test_executors.py
+++ b/jenkinsapi_tests/unittests/test_executors.py
@@ -1,6 +1,6 @@
 import mock
 import types
-import unittest
+import unittest2 as unittest
 
 from jenkinsapi.custom_exceptions import JenkinsAPIException
 from jenkinsapi.jenkins import Jenkins

diff --git a/jenkinsapi_tests/unittests/test_fingerprint.py b/jenkinsapi_tests/unittests/test_fingerprint.py
index f34e5aa5de89a87734b019951d46b98167d07f1c..629c97b27d45847e75d1231cfc50389c682f092d 100644 (file)
--- a/jenkinsapi_tests/unittests/test_fingerprint.py
+++ b/jenkinsapi_tests/unittests/test_fingerprint.py
@@ -1,5 +1,5 @@
 import mock
-import unittest
+import unittest2 as unittest
 import hashlib
 import requests
 

diff --git a/jenkinsapi_tests/unittests/test_jenkins.py b/jenkinsapi_tests/unittests/test_jenkins.py
index c0bad0accd8684c2c4614ce05bb03bd2e96fe511..c8e101706fa7b5d496fdfec9bd1225d0dbd77cb2 100644 (file)
--- a/jenkinsapi_tests/unittests/test_jenkins.py
+++ b/jenkinsapi_tests/unittests/test_jenkins.py
@@ -1,5 +1,5 @@
 import mock
-import unittest
+import unittest2 as unittest
 
 from jenkinsapi.plugins import Plugins
 from jenkinsapi.utils.requester import Requester

diff --git a/jenkinsapi_tests/unittests/test_job.py b/jenkinsapi_tests/unittests/test_job.py
index 898461c38df0d70b2eae296c8aa15174dd3cc105..9637ab20e829672b146dfebbcb847c7d53d6806a 100644 (file)
--- a/jenkinsapi_tests/unittests/test_job.py
+++ b/jenkinsapi_tests/unittests/test_job.py
@@ -1,5 +1,5 @@
 import mock
-import unittest
+import unittest2 as unittest
 
 from jenkinsapi import config
 from jenkinsapi.job import Job

diff --git a/jenkinsapi_tests/unittests/test_job_folders.py b/jenkinsapi_tests/unittests/test_job_folders.py
index 15cfa4a078a18086cc4cee14f906def3830e305f..206b743783ec8c0d8d53505873855ac258261985 100644 (file)
--- a/jenkinsapi_tests/unittests/test_job_folders.py
+++ b/jenkinsapi_tests/unittests/test_job_folders.py
@@ -1,5 +1,5 @@
 import mock
-import unittest
+import unittest2 as unittest
 
 from jenkinsapi.jenkins import JenkinsBase
 

diff --git a/jenkinsapi_tests/unittests/test_job_get_all_builds.py b/jenkinsapi_tests/unittests/test_job_get_all_builds.py
index bae75036114c136e9ac37af63dc3c853246d7956..3de028ce17ef08a1b9d5fe193e552fdde0b63ef7 100644 (file)
--- a/jenkinsapi_tests/unittests/test_job_get_all_builds.py
+++ b/jenkinsapi_tests/unittests/test_job_get_all_builds.py
@@ -1,5 +1,5 @@
 import mock
-import unittest
+import unittest2 as unittest
 
 from jenkinsapi import config
 from jenkinsapi.job import Job

diff --git a/jenkinsapi_tests/unittests/test_job_multiconf.py b/jenkinsapi_tests/unittests/test_job_multiconf.py
index b994bdd92d4191bd8a753fdeded2cdb58ec280ff..ed806222cdc9ea40c4f285416ad6c9acdadded92 100644 (file)
--- a/jenkinsapi_tests/unittests/test_job_multiconf.py
+++ b/jenkinsapi_tests/unittests/test_job_multiconf.py
@@ -1,5 +1,5 @@
 # import mock
-# import unittest
+# import unittest2 as unittest
 
 # from jenkinsapi.job import Job
 # from jenkinsapi.jenkinsbase import JenkinsBase

diff --git a/jenkinsapi_tests/unittests/test_job_scm_hg.py b/jenkinsapi_tests/unittests/test_job_scm_hg.py
index 63806ae2a9bf285d6fcf6bb784c7a554f204a8cd..b1683ede053ec9b3407e6cb95104a6edededfbd6 100644 (file)
--- a/jenkinsapi_tests/unittests/test_job_scm_hg.py
+++ b/jenkinsapi_tests/unittests/test_job_scm_hg.py
@@ -1,5 +1,5 @@
 import mock
-import unittest
+import unittest2 as unittest
 
 from jenkinsapi import config
 from jenkinsapi.job import Job
@@ -91,7 +91,7 @@ class TestHgJob(unittest.TestCase):
     @mock.patch.object(Job,'get_config',configtree_with_branch)
     def test_hg_attributes(self):
         expected_url = ['http://cm5/hg/sandbox/v01.0/int']
-        self.assertEquals(self.j.get_scm_type(),'hg') 
+        self.assertEquals(self.j.get_scm_type(),'hg')
         self.assertEquals(self.j.get_scm_url(),expected_url)
         self.assertEquals(self.j.get_scm_branch(),['testme'])
 

diff --git a/jenkinsapi_tests/unittests/test_node.py b/jenkinsapi_tests/unittests/test_node.py
index daf947b7300384c14602b8a0420ac48a110ee5da..9fb5db10af1b98108e0e8214311acebc5c2b5b15 100644 (file)
--- a/jenkinsapi_tests/unittests/test_node.py
+++ b/jenkinsapi_tests/unittests/test_node.py
@@ -1,5 +1,5 @@
 import mock
-import unittest
+import unittest2 as unittest
 
 from jenkinsapi.node import Node
 

diff --git a/jenkinsapi_tests/unittests/test_nodes.py b/jenkinsapi_tests/unittests/test_nodes.py
index 7a13df520c9d301ca9ab056188cc076615cb787c..a2d45f14b53a19cd9b66e1f27edda39637032ff3 100644 (file)
--- a/jenkinsapi_tests/unittests/test_nodes.py
+++ b/jenkinsapi_tests/unittests/test_nodes.py
@@ -1,5 +1,5 @@
 import mock
-import unittest
+import unittest2 as unittest
 
 from jenkinsapi.jenkins import Jenkins
 from jenkinsapi.nodes import Nodes

diff --git a/jenkinsapi_tests/unittests/test_plugins.py b/jenkinsapi_tests/unittests/test_plugins.py
index 93af922a0a947024934a835579f272cfe0da717d..202b5cd2a9dfb1540759bd26e18e6ee14704a85f 100644 (file)
--- a/jenkinsapi_tests/unittests/test_plugins.py
+++ b/jenkinsapi_tests/unittests/test_plugins.py
@@ -1,5 +1,5 @@
 import mock
-import unittest
+import unittest2 as unittest
 
 from jenkinsapi.jenkins import Jenkins
 from jenkinsapi.plugins import Plugins

diff --git a/jenkinsapi_tests/unittests/test_queue.py b/jenkinsapi_tests/unittests/test_queue.py
index 0f043be7caf33e11e559520e21b5446da58125e9..ed61be8002e63f4a44843ccef9ca7255dede420a 100644 (file)
--- a/jenkinsapi_tests/unittests/test_queue.py
+++ b/jenkinsapi_tests/unittests/test_queue.py
@@ -1,5 +1,5 @@
 import mock
-import unittest
+import unittest2 as unittest
 
 from jenkinsapi import config
 from jenkinsapi.jenkins import Jenkins

diff --git a/jenkinsapi_tests/unittests/test_requester.py b/jenkinsapi_tests/unittests/test_requester.py
index 521e1dfb993ee21b8686edbe958d67a06a7d978b..619fbcef04a7bc99ac1d3d80d0654debb7389b0f 100644 (file)
--- a/jenkinsapi_tests/unittests/test_requester.py
+++ b/jenkinsapi_tests/unittests/test_requester.py
@@ -1,7 +1,7 @@
 from __future__ import print_function
 
 import mock
-import unittest
+import unittest2 as unittest
 
 import requests
 from jenkinsapi.jenkins import Requester

diff --git a/jenkinsapi_tests/unittests/test_result_set.py b/jenkinsapi_tests/unittests/test_result_set.py
index a71a4ef3d4ea7391593a4ed41c60f48d41338e22..7fbee1044414ea4fd15f4848181da89b42b6f6e2 100644 (file)
--- a/jenkinsapi_tests/unittests/test_result_set.py
+++ b/jenkinsapi_tests/unittests/test_result_set.py
@@ -1,5 +1,5 @@
 import mock
-import unittest
+import unittest2 as unittest
 
 from jenkinsapi.result_set import ResultSet
 from jenkinsapi.result import Result

diff --git a/jenkinsapi_tests/unittests/test_view.py b/jenkinsapi_tests/unittests/test_view.py
index 0c193c05c325c2de3554afd09c31e0ef36caea96..ab8acc7db549d47fb193ad280606a6f3688e1fc4 100644 (file)
--- a/jenkinsapi_tests/unittests/test_view.py
+++ b/jenkinsapi_tests/unittests/test_view.py
@@ -1,5 +1,5 @@
 import mock
-import unittest
+import unittest2 as unittest
 
 from jenkinsapi.jenkinsbase import JenkinsBase
 from jenkinsapi.jenkins import Jenkins

diff --git a/jenkinsapi_tests/unittests/test_views.py b/jenkinsapi_tests/unittests/test_views.py
index 799398056e90675907edd41d7a6995b38ca71ec5..3bf07bdf9c27b574d607fcaf1ca888b6dfdbfd5a 100644 (file)
--- a/jenkinsapi_tests/unittests/test_views.py
+++ b/jenkinsapi_tests/unittests/test_views.py
@@ -1,5 +1,5 @@
 import mock
-import unittest
+import unittest2 as unittest
 from jenkinsapi import config
 from jenkinsapi.view import View
 from jenkinsapi.jenkins import Jenkins

diff --git a/setup.py b/setup.py
index 05ccab1d5d92770cd426a681e5bbd2a673e4f7ed..37cc46054b81977f11146da76e982aeee921c327 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -29,7 +29,7 @@ setup(
     include_package_data=False,
     install_requires=['requests>=1.2.3', 'pytz>=2013b'],
     test_suite='nose.collector',
-    tests_require=['mock', 'nose', 'coverage'],
+    tests_require=['mock', 'nose', 'coverage', 'unittest2'],
     entry_points=GLOBAL_ENTRY_POINTS,
     url=PROJECT_URL,
     description=SHORT_DESCRIPTION,