Set unitest2 to be used only on python 2.6

diff --git a/.travis.yml b/.travis.yml
index 5bbb5b2..64f8ef6 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 e1cf133..d4a4f6b 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 e0e5fdf..df9c97f 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 479a1c2..4631070 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 45f14d6..9c0c230 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 daf93f8..7be315e 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 4f13097..7775545 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 e153667..54849cc 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 13d0e8d..2d92268 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 adabbe1..4286d40 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 e1ec2da..e02b08f 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 a979ec3..7c4ea40 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 d4c8301..6d91c6e 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 8e30f55..c3529ad 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 b80984e..e2f09d5 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 402ed6d..03e0b7c 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 629c97b..378bbdf 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 c8e1017..c452d4d 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 9637ab2..73ce3dd 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 206b743..b9a7e8b 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 3de028c..df3bb0c 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 ed80622..8e06da3 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 b1683ed..977ff81 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 9fb5db1..211c3c8 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 a2d45f1..6ae8467 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 202b5cd..6eb5eea 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 ed61be8..d473cbb 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 619fbce..49ae527 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 7fbee10..9aa310e 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 ab8acc7..f574366 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 3bf07bd..0d87320 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