Set unitest2 to be used only on python 2.6

diff --git a/.travis.yml b/.travis.yml
index 5bbb5b24ed51100083faaf62abf871a1ace6b46e..64f8ef610a2085aff415266e1e09cbea52fd0a72 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ python:
 # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
 install:
     - python setup.py develop
-    - pip install --use-mirrors nose mock coverage pep8 pylint unittest2
+    - pip install --use-mirrors nose mock coverage pep8 pylint
 
 # command to run tests, e.g. python setup.py test
 script:

diff --git a/jenkinsapi_tests/systests/base.py b/jenkinsapi_tests/systests/base.py
index e1cf133d8c5e9cf37c20d30a7ab3397ea59afee7..d4a4f6bbfa598b727c2a2c4710fef4f096d7631f 100644 (file)
--- a/jenkinsapi_tests/systests/base.py
+++ b/jenkinsapi_tests/systests/base.py
@@ -1,4 +1,9 @@
-import unittest2 as unittest
+# For tests on python 2.6 please use unittest2 library
+try:
+    import unittest2 as unittest
+except ImportError:
+    import 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 e0e5fdf3c396e89beab99da04f4927bec2ac2d2d..df9c97f98e39037ca02e9314e42831af5feea47a 100644 (file)
--- a/jenkinsapi_tests/systests/test_downstream_upstream.py
+++ b/jenkinsapi_tests/systests/test_downstream_upstream.py
@@ -3,7 +3,11 @@ System tests for `jenkinsapi.jenkins` module.
 '''
 import time
 import logging
-import unittest2 as unittest
+# To run unittests on python 2.6 please use unittest2 library
+try:
+    import unittest2 as unittest
+except ImportError:
+    import 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 479a1c2b70c6ec9f04c38769ab2967ebc0179f64..4631070050cc1584164d00321609c77b830c651a 100644 (file)
--- a/jenkinsapi_tests/systests/test_executors.py
+++ b/jenkinsapi_tests/systests/test_executors.py
@@ -7,7 +7,11 @@ 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 unittest2 as unittest
+# To run unittests on python 2.6 please use unittest2 library
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 
 
 log = logging.getLogger(__name__)

diff --git a/jenkinsapi_tests/systests/test_invocation.py b/jenkinsapi_tests/systests/test_invocation.py
index 45f14d6f97e7aff5828270cb4e86c6a8533fbcfc..9c0c230ad69e605b8abf58897c3cb162be758695 100644 (file)
--- a/jenkinsapi_tests/systests/test_invocation.py
+++ b/jenkinsapi_tests/systests/test_invocation.py
@@ -1,7 +1,11 @@
 '''
 System tests for `jenkinsapi.jenkins` module.
 '''
-import unittest2 as unittest
+# To run unittests on python 2.6 please use unittest2 library
+try:
+    import unittest2 as unittest
+except ImportError:
+    import 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 daf93f82162d630b5d05c1724c8303420909856a..7be315ea8cd67807c90f256126ed1a011bea550f 100644 (file)
--- a/jenkinsapi_tests/systests/test_jenkins.py
+++ b/jenkinsapi_tests/systests/test_jenkins.py
@@ -1,7 +1,11 @@
 '''
 System tests for `jenkinsapi.jenkins` module.
 '''
-import unittest2 as unittest
+# To run unittests on python 2.6 please use unittest2 library
+try:
+    import unittest2 as unittest
+except ImportError:
+    import 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 4f13097fed0abd6cd51d3f1ccee079fc783886fa..77755451b170206f4fd9c2480ebacda3ce8a997b 100644 (file)
--- a/jenkinsapi_tests/systests/test_jenkins_artifacts.py
+++ b/jenkinsapi_tests/systests/test_jenkins_artifacts.py
@@ -7,7 +7,11 @@ import time
 import gzip
 import shutil
 import tempfile
-import unittest2 as unittest
+# To run unittests on python 2.6 please use unittest2 library
+try:
+    import unittest2 as unittest
+except ImportError:
+    import 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 e1536673a88419c99b7455094fbf7fbfc56b799f..54849cce82fac17c741a6bcfbdef92f0132671e0 100644 (file)
--- a/jenkinsapi_tests/systests/test_jenkins_matrix.py
+++ b/jenkinsapi_tests/systests/test_jenkins_matrix.py
@@ -3,7 +3,11 @@ System tests for `jenkinsapi.jenkins` module.
 '''
 import re
 import time
-import unittest2 as unittest
+# To run unittests on python 2.6 please use unittest2 library
+try:
+    import unittest2 as unittest
+except ImportError:
+    import 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 13d0e8da4ee8ef7770547323341befc2775a8f0d..2d92268a043fa944a2aa96635eccfb5274d9ca85 100644 (file)
--- a/jenkinsapi_tests/systests/test_nodes.py
+++ b/jenkinsapi_tests/systests/test_nodes.py
@@ -2,7 +2,11 @@
 System tests for `jenkinsapi.jenkins` module.
 '''
 import logging
-import unittest2 as unittest
+# To run unittests on python 2.6 please use unittest2 library
+try:
+    import unittest2 as unittest
+except ImportError:
+    import 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 adabbe173cadb8c7265c4ba3e3177dec1545680c..4286d4025176524751d01b094ff37381206f0cd9 100644 (file)
--- a/jenkinsapi_tests/systests/test_parameterized_builds.py
+++ b/jenkinsapi_tests/systests/test_parameterized_builds.py
@@ -2,7 +2,11 @@
 System tests for `jenkinsapi.jenkins` module.
 '''
 import time
-import unittest2 as unittest
+# To run unittests on python 2.6 please use unittest2 library
+try:
+    import unittest2 as unittest
+except ImportError:
+    import 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 e1ec2da95e647ed23367b63d39ce777d76f74307..e02b08ffdc23fcdf9377c17a5754cabc2debf3a1 100644 (file)
--- a/jenkinsapi_tests/systests/test_queue.py
+++ b/jenkinsapi_tests/systests/test_queue.py
@@ -3,7 +3,11 @@ System tests for `jenkinsapi.jenkins` module.
 '''
 import time
 import logging
-import unittest2 as unittest
+# To run unittests on python 2.6 please use unittest2 library
+try:
+    import unittest2 as unittest
+except ImportError:
+    import 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 a979ec355b23e2c0b1b625bc6f5cefd2722caed6..7c4ea40b115ea4564a3cc9be2403796e8eb05d43 100644 (file)
--- a/jenkinsapi_tests/systests/test_scm.py
+++ b/jenkinsapi_tests/systests/test_scm.py
@@ -1,7 +1,11 @@
 # '''
 # System tests for `jenkinsapi.jenkins` module.
 # '''
-# import unittest2 as unittest
+# To run unittests on python 2.6 please use unittest2 library
+# try:
+    # import unittest2 as unittest
+# except ImportError:
+    # import 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 d4c830173fc0bb57ae24935c22b4f2ec351beee6..6d91c6e0dfdd52cf82d269b11a51a3a4a72ba33e 100644 (file)
--- a/jenkinsapi_tests/systests/test_views.py
+++ b/jenkinsapi_tests/systests/test_views.py
@@ -2,7 +2,11 @@
 System tests for `jenkinsapi.jenkins` module.
 '''
 import logging
-import unittest2 as unittest
+# To run unittests on python 2.6 please use unittest2 library
+try:
+    import unittest2 as unittest
+except ImportError:
+    import 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 8e30f554b07cfe9d253cdd2f5a68b5c68842770e..c3529ad2087dcf9e735fc6a986950316b7374b98 100644 (file)
--- a/jenkinsapi_tests/unittests/test_build.py
+++ b/jenkinsapi_tests/unittests/test_build.py
@@ -1,6 +1,10 @@
 import pytz
 import mock
-import unittest2 as unittest
+# To run unittests on python 2.6 please use unittest2 library
+try:
+    import unittest2 as unittest
+except ImportError:
+    import 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 b80984e779e93e8e4f4d1d378939399daf82bd43..e2f09d5b751bf659d4d4279217fdcaafe37b1716 100644 (file)
--- a/jenkinsapi_tests/unittests/test_build_scm_git.py
+++ b/jenkinsapi_tests/unittests/test_build_scm_git.py
@@ -1,5 +1,9 @@
 import mock
-import unittest2 as unittest
+# To run unittests on python 2.6 please use unittest2 library
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 from jenkinsapi.build import Build
 
 

diff --git a/jenkinsapi_tests/unittests/test_executors.py b/jenkinsapi_tests/unittests/test_executors.py
index 402ed6ddc1a2e2a00e839fdf5af9b37b833f5950..03e0b7ccfe339e4baa61b7ffbdf94c255a5cb146 100644 (file)
--- a/jenkinsapi_tests/unittests/test_executors.py
+++ b/jenkinsapi_tests/unittests/test_executors.py
@@ -1,6 +1,10 @@
 import mock
 import types
-import unittest2 as unittest
+# To run unittests on python 2.6 please use unittest2 library
+try:
+    import unittest2 as unittest
+except ImportError:
+    import 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 629c97b27d45847e75d1231cfc50389c682f092d..378bbdf99b175de6f15708c2297b5fd8bb404278 100644 (file)
--- a/jenkinsapi_tests/unittests/test_fingerprint.py
+++ b/jenkinsapi_tests/unittests/test_fingerprint.py
@@ -1,5 +1,9 @@
 import mock
-import unittest2 as unittest
+# To run unittests on python 2.6 please use unittest2 library
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 import hashlib
 import requests
 

diff --git a/jenkinsapi_tests/unittests/test_jenkins.py b/jenkinsapi_tests/unittests/test_jenkins.py
index c8e101706fa7b5d496fdfec9bd1225d0dbd77cb2..c452d4d3595a222c82169017d5e6c9ae7db37d8c 100644 (file)
--- a/jenkinsapi_tests/unittests/test_jenkins.py
+++ b/jenkinsapi_tests/unittests/test_jenkins.py
@@ -1,5 +1,9 @@
 import mock
-import unittest2 as unittest
+# To run unittests on python 2.6 please use unittest2 library
+try:
+    import unittest2 as unittest
+except ImportError:
+    import 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 9637ab20e829672b146dfebbcb847c7d53d6806a..73ce3dd0b762c6d7c9f1ba2c6e06d457a15dc012 100644 (file)
--- a/jenkinsapi_tests/unittests/test_job.py
+++ b/jenkinsapi_tests/unittests/test_job.py
@@ -1,5 +1,9 @@
 import mock
-import unittest2 as unittest
+# To run unittests on python 2.6 please use unittest2 library
+try:
+    import unittest2 as unittest
+except ImportError:
+    import 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 206b743783ec8c0d8d53505873855ac258261985..b9a7e8bdd1a9d022f2e0042bc5e57dc6aabda434 100644 (file)
--- a/jenkinsapi_tests/unittests/test_job_folders.py
+++ b/jenkinsapi_tests/unittests/test_job_folders.py
@@ -1,5 +1,9 @@
 import mock
-import unittest2 as unittest
+# To run unittests on python 2.6 please use unittest2 library
+try:
+    import unittest2 as unittest
+except ImportError:
+    import 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 3de028ce17ef08a1b9d5fe193e552fdde0b63ef7..df3bb0c586091ff267b53c7e0d25e4d483304236 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,9 @@
 import mock
-import unittest2 as unittest
+# To run unittests on python 2.6 please use unittest2 library
+try:
+    import unittest2 as unittest
+except ImportError:
+    import 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 ed806222cdc9ea40c4f285416ad6c9acdadded92..8e06da30c796667737cd51667bbb59a424517de6 100644 (file)
--- a/jenkinsapi_tests/unittests/test_job_multiconf.py
+++ b/jenkinsapi_tests/unittests/test_job_multiconf.py
@@ -1,5 +1,9 @@
 # import mock
-# import unittest2 as unittest
+# To run unittests on python 2.6 please use unittest2 library
+# try:
+    # import unittest2 as unittest
+# except ImportError:
+    # import 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 b1683ede053ec9b3407e6cb95104a6edededfbd6..977ff81aa9ca65d51ac24b882837f0c0caffc3e8 100644 (file)
--- a/jenkinsapi_tests/unittests/test_job_scm_hg.py
+++ b/jenkinsapi_tests/unittests/test_job_scm_hg.py
@@ -1,5 +1,9 @@
 import mock
-import unittest2 as unittest
+# To run unittests on python 2.6 please use unittest2 library
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 
 from jenkinsapi import config
 from jenkinsapi.job import Job

diff --git a/jenkinsapi_tests/unittests/test_node.py b/jenkinsapi_tests/unittests/test_node.py
index 9fb5db10af1b98108e0e8214311acebc5c2b5b15..211c3c8a51e169bc7a46af504f06095ce0481b69 100644 (file)
--- a/jenkinsapi_tests/unittests/test_node.py
+++ b/jenkinsapi_tests/unittests/test_node.py
@@ -1,5 +1,9 @@
 import mock
-import unittest2 as unittest
+# To run unittests on python 2.6 please use unittest2 library
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 
 from jenkinsapi.node import Node
 

diff --git a/jenkinsapi_tests/unittests/test_nodes.py b/jenkinsapi_tests/unittests/test_nodes.py
index a2d45f14b53a19cd9b66e1f27edda39637032ff3..6ae8467b330e59a6837ca682263d56172d04eb0f 100644 (file)
--- a/jenkinsapi_tests/unittests/test_nodes.py
+++ b/jenkinsapi_tests/unittests/test_nodes.py
@@ -1,5 +1,9 @@
 import mock
-import unittest2 as unittest
+# To run unittests on python 2.6 please use unittest2 library
+try:
+    import unittest2 as unittest
+except ImportError:
+    import 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 202b5cd2a9dfb1540759bd26e18e6ee14704a85f..6eb5eeaa59ceedb8ab5c6209e562645820ccf352 100644 (file)
--- a/jenkinsapi_tests/unittests/test_plugins.py
+++ b/jenkinsapi_tests/unittests/test_plugins.py
@@ -1,5 +1,9 @@
 import mock
-import unittest2 as unittest
+# To run unittests on python 2.6 please use unittest2 library
+try:
+    import unittest2 as unittest
+except ImportError:
+    import 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 ed61be8002e63f4a44843ccef9ca7255dede420a..d473cbbb392003541fe81746bd1eef33fd975623 100644 (file)
--- a/jenkinsapi_tests/unittests/test_queue.py
+++ b/jenkinsapi_tests/unittests/test_queue.py
@@ -1,5 +1,9 @@
 import mock
-import unittest2 as unittest
+# To run unittests on python 2.6 please use unittest2 library
+try:
+    import unittest2 as unittest
+except ImportError:
+    import 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 619fbcef04a7bc99ac1d3d80d0654debb7389b0f..49ae52708ea67020d70f051b131ff6ed8c605ef0 100644 (file)
--- a/jenkinsapi_tests/unittests/test_requester.py
+++ b/jenkinsapi_tests/unittests/test_requester.py
@@ -1,7 +1,11 @@
 from __future__ import print_function
 
 import mock
-import unittest2 as unittest
+# To run unittests on python 2.6 please use unittest2 library
+try:
+    import unittest2 as unittest
+except ImportError:
+    import 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 7fbee1044414ea4fd15f4848181da89b42b6f6e2..9aa310e484999a612c83e35805aeab08e0d148af 100644 (file)
--- a/jenkinsapi_tests/unittests/test_result_set.py
+++ b/jenkinsapi_tests/unittests/test_result_set.py
@@ -1,5 +1,9 @@
 import mock
-import unittest2 as unittest
+# To run unittests on python 2.6 please use unittest2 library
+try:
+    import unittest2 as unittest
+except ImportError:
+    import 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 ab8acc7db549d47fb193ad280606a6f3688e1fc4..f574366f21d42334d25593e700852799877c411e 100644 (file)
--- a/jenkinsapi_tests/unittests/test_view.py
+++ b/jenkinsapi_tests/unittests/test_view.py
@@ -1,5 +1,9 @@
 import mock
-import unittest2 as unittest
+# To run unittests on python 2.6 please use unittest2 library
+try:
+    import unittest2 as unittest
+except ImportError:
+    import 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 3bf07bdf9c27b574d607fcaf1ca888b6dfdbfd5a..0d873207b38f477a704706eb574bee1ebc3f91ee 100644 (file)
--- a/jenkinsapi_tests/unittests/test_views.py
+++ b/jenkinsapi_tests/unittests/test_views.py
@@ -1,5 +1,9 @@
 import mock
-import unittest2 as unittest
+# To run unittests on python 2.6 please use unittest2 library
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 from jenkinsapi import config
 from jenkinsapi.view import View
 from jenkinsapi.jenkins import Jenkins