From: Aleksey Maksimov Date: Sat, 12 Apr 2014 14:55:20 +0000 (+0800) Subject: Set to use unittest2 library instead of unittest X-Git-Tag: v0.2.23~23^2^2~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fc47155fbc580965ebfa538aa53a5d411d31f0f8;p=tools%2Fpython-jenkinsapi.git 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 758ec86..e1cf133 100644 --- 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 0470632..e0e5fdf 100644 --- 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 b289069..479a1c2 100644 --- 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 a79ed36..45f14d6 100644 --- 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 92a44a0..daf93f8 100644 --- 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 693f4f1..4f13097 100644 --- 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 3df8de6..e153667 100644 --- 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 b125589..13d0e8d 100644 --- 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 205fc78..adabbe1 100644 --- 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 bb3d3f2..e1ec2da 100644 --- 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 3147fb0..a979ec3 100644 --- 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 be9cfa9..d4c8301 100644 --- 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 0aa365a..8e30f55 100644 --- 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 7983e59..b80984e 100644 --- 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 45159c4..402ed6d 100644 --- 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 f34e5aa..629c97b 100644 --- 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 c0bad0a..c8e1017 100644 --- 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 898461c..9637ab2 100644 --- 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 15cfa4a..206b743 100644 --- 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 bae7503..3de028c 100644 --- 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 b994bdd..ed80622 100644 --- 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 63806ae..b1683ed 100644 --- 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 daf947b..9fb5db1 100644 --- 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 7a13df5..a2d45f1 100644 --- 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 93af922..202b5cd 100644 --- 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 0f043be..ed61be8 100644 --- 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 521e1df..619fbce 100644 --- 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 a71a4ef..7fbee10 100644 --- 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 0c193c0..ab8acc7 100644 --- 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 7993980..3bf07bd 100644 --- 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 05ccab1..37cc460 100644 --- 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,