diff --git a/Makefile b/Makefile index cee89828..24b830d9 100644 --- a/Makefile +++ b/Makefile @@ -80,8 +80,9 @@ test: test2 test3 test2: coverage2 erase - PYTHONPATH=hub/.:plugins/hub/.:plugins/builder/.:plugins/cli/.:cli/.:www/lib coverage2 run \ - --source . -m nose + PYTHONPATH=.:plugins/builder/.:plugins/cli/.:cli/.:www/lib coverage2 run \ + --source . -m nose tests/test_builder tests/test_cli tests/test_lib \ + tests/test_plugins/test*builder.py tests/test_plugins/test*cli.py coverage2 report coverage2 html @echo Full coverage report at file://${CURDIR}/htmlcov/py2/index.html diff --git a/tests/test_hub/test_add_archivetype.py b/tests/test_hub/test_add_archivetype.py index e46d4afa..8f2d722a 100644 --- a/tests/test_hub/test_add_archivetype.py +++ b/tests/test_hub/test_add_archivetype.py @@ -1,8 +1,4 @@ -from __future__ import absolute_import -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import mock import koji diff --git a/tests/test_hub/test_add_btype.py b/tests/test_hub/test_add_btype.py index 64f19e1d..e64cc0f0 100644 --- a/tests/test_hub/test_add_btype.py +++ b/tests/test_hub/test_add_btype.py @@ -1,8 +1,4 @@ -from __future__ import absolute_import -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import mock import koji diff --git a/tests/test_hub/test_add_external_rpm.py b/tests/test_hub/test_add_external_rpm.py index a869256e..7aa928b5 100644 --- a/tests/test_hub/test_add_external_rpm.py +++ b/tests/test_hub/test_add_external_rpm.py @@ -1,9 +1,5 @@ -from __future__ import absolute_import import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import koji import kojihub diff --git a/tests/test_hub/test_add_host.py b/tests/test_hub/test_add_host.py index 61c8a388..0c2a8dcb 100644 --- a/tests/test_hub/test_add_host.py +++ b/tests/test_hub/test_add_host.py @@ -1,9 +1,5 @@ -from __future__ import absolute_import import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import koji import kojihub diff --git a/tests/test_hub/test_add_host_to_channel.py b/tests/test_hub/test_add_host_to_channel.py index 68f2fc43..38534779 100644 --- a/tests/test_hub/test_add_host_to_channel.py +++ b/tests/test_hub/test_add_host_to_channel.py @@ -1,9 +1,5 @@ -from __future__ import absolute_import import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import koji import kojihub diff --git a/tests/test_hub/test_apply_query_opts.py b/tests/test_hub/test_apply_query_opts.py index d8652d6b..c1f34a3c 100644 --- a/tests/test_hub/test_apply_query_opts.py +++ b/tests/test_hub/test_apply_query_opts.py @@ -1,9 +1,5 @@ -from __future__ import absolute_import import copy -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest from nose.tools import eq_ import kojihub diff --git a/tests/test_hub/test_cg_importer.py b/tests/test_hub/test_cg_importer.py index defe7100..e73b0ca3 100644 --- a/tests/test_hub/test_cg_importer.py +++ b/tests/test_hub/test_cg_importer.py @@ -1,11 +1,7 @@ -from __future__ import absolute_import import mock import os import shutil -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import koji import kojihub diff --git a/tests/test_hub/test_check_volume_policy.py b/tests/test_hub/test_check_volume_policy.py index f3b6a8b4..6fd20e8b 100644 --- a/tests/test_hub/test_check_volume_policy.py +++ b/tests/test_hub/test_check_volume_policy.py @@ -1,9 +1,5 @@ -from __future__ import absolute_import import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import koji import koji.policy import kojihub diff --git a/tests/test_hub/test_complete_image_build.py b/tests/test_hub/test_complete_image_build.py index 0b0d3546..ddcfd5cc 100644 --- a/tests/test_hub/test_complete_image_build.py +++ b/tests/test_hub/test_complete_image_build.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import copy import json import mock @@ -6,10 +5,8 @@ import os import os.path import shutil import tempfile -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest + import koji import koji.util import kojihub diff --git a/tests/test_hub/test_complete_maven_build.py b/tests/test_hub/test_complete_maven_build.py index d2a57788..9f38b8a1 100644 --- a/tests/test_hub/test_complete_maven_build.py +++ b/tests/test_hub/test_complete_maven_build.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import copy import json import mock @@ -6,10 +5,8 @@ import os import os.path import shutil import tempfile -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest + import koji import koji.util import kojihub diff --git a/tests/test_hub/test_create_tag.py b/tests/test_hub/test_create_tag.py index bf79501f..f5d026eb 100644 --- a/tests/test_hub/test_create_tag.py +++ b/tests/test_hub/test_create_tag.py @@ -1,10 +1,7 @@ # coding: utf-8 -from __future__ import absolute_import import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest + import koji import kojihub diff --git a/tests/test_hub/test_delete_build.py b/tests/test_hub/test_delete_build.py index 83824cc6..df9ca189 100644 --- a/tests/test_hub/test_delete_build.py +++ b/tests/test_hub/test_delete_build.py @@ -1,9 +1,5 @@ -from __future__ import absolute_import import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import kojihub import time from koji import GenericError diff --git a/tests/test_hub/test_delete_tag.py b/tests/test_hub/test_delete_tag.py index 7fcf6b41..71deb464 100644 --- a/tests/test_hub/test_delete_tag.py +++ b/tests/test_hub/test_delete_tag.py @@ -1,9 +1,5 @@ -from __future__ import absolute_import import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import koji import kojihub diff --git a/tests/test_hub/test_dist_repo.py b/tests/test_hub/test_dist_repo.py index 92e34bfa..c5e9626a 100644 --- a/tests/test_hub/test_dist_repo.py +++ b/tests/test_hub/test_dist_repo.py @@ -1,8 +1,4 @@ -from __future__ import absolute_import -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import json import mock import os diff --git a/tests/test_hub/test_edit_host.py b/tests/test_hub/test_edit_host.py index a4b61d34..a687bd0c 100644 --- a/tests/test_hub/test_edit_host.py +++ b/tests/test_hub/test_edit_host.py @@ -1,9 +1,5 @@ -from __future__ import absolute_import import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import koji import kojihub diff --git a/tests/test_hub/test_edit_tag.py b/tests/test_hub/test_edit_tag.py index e2070746..118f84ec 100644 --- a/tests/test_hub/test_edit_tag.py +++ b/tests/test_hub/test_edit_tag.py @@ -1,10 +1,6 @@ # coding: utf-8 -from __future__ import absolute_import import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import koji import kojihub diff --git a/tests/test_hub/test_edit_tag_external_repo.py b/tests/test_hub/test_edit_tag_external_repo.py index f7dd3b4a..a71b5ece 100644 --- a/tests/test_hub/test_edit_tag_external_repo.py +++ b/tests/test_hub/test_edit_tag_external_repo.py @@ -1,8 +1,5 @@ import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import koji import kojihub diff --git a/tests/test_hub/test_edit_user.py b/tests/test_hub/test_edit_user.py index 65fc11dd..db6fc217 100644 --- a/tests/test_hub/test_edit_user.py +++ b/tests/test_hub/test_edit_user.py @@ -1,8 +1,5 @@ import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import koji import kojihub diff --git a/tests/test_hub/test_ensure_volume_symlink.py b/tests/test_hub/test_ensure_volume_symlink.py index 31233c3d..fadde6e3 100644 --- a/tests/test_hub/test_ensure_volume_symlink.py +++ b/tests/test_hub/test_ensure_volume_symlink.py @@ -1,13 +1,9 @@ -from __future__ import absolute_import import mock import os import os.path import shutil import tempfile -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import koji import kojihub diff --git a/tests/test_hub/test_getPackageID.py b/tests/test_hub/test_getPackageID.py index 8172bbc3..01a03815 100644 --- a/tests/test_hub/test_getPackageID.py +++ b/tests/test_hub/test_getPackageID.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import mock from .utils import DBQueryTestCase diff --git a/tests/test_hub/test_getRPMDeps.py b/tests/test_hub/test_getRPMDeps.py index d7b9c28f..22ea23ae 100644 --- a/tests/test_hub/test_getRPMDeps.py +++ b/tests/test_hub/test_getRPMDeps.py @@ -1,10 +1,6 @@ -from __future__ import absolute_import import mock import os -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import koji import kojihub diff --git a/tests/test_hub/test_getRPMFile.py b/tests/test_hub/test_getRPMFile.py index 98d1b2f6..b84ba04a 100644 --- a/tests/test_hub/test_getRPMFile.py +++ b/tests/test_hub/test_getRPMFile.py @@ -1,13 +1,9 @@ -from __future__ import absolute_import import os import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import koji import kojihub diff --git a/tests/test_hub/test_get_active_repos.py b/tests/test_hub/test_get_active_repos.py index 54db43d7..6f473be0 100644 --- a/tests/test_hub/test_get_active_repos.py +++ b/tests/test_hub/test_get_active_repos.py @@ -1,9 +1,5 @@ -from __future__ import absolute_import import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import koji import kojihub import koji.db diff --git a/tests/test_hub/test_get_archive_file.py b/tests/test_hub/test_get_archive_file.py index cec5ef00..ff71ad15 100644 --- a/tests/test_hub/test_get_archive_file.py +++ b/tests/test_hub/test_get_archive_file.py @@ -1,9 +1,5 @@ -from __future__ import absolute_import import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import koji import kojihub diff --git a/tests/test_hub/test_get_build_logs.py b/tests/test_hub/test_get_build_logs.py index 30e4d209..b18f0847 100644 --- a/tests/test_hub/test_get_build_logs.py +++ b/tests/test_hub/test_get_build_logs.py @@ -1,12 +1,8 @@ -from __future__ import absolute_import import mock import os import shutil import tempfile -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import koji import kojihub diff --git a/tests/test_hub/test_get_build_notifications.py b/tests/test_hub/test_get_build_notifications.py index 275549e1..b4fb1765 100644 --- a/tests/test_hub/test_get_build_notifications.py +++ b/tests/test_hub/test_get_build_notifications.py @@ -1,8 +1,5 @@ import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import koji import kojihub diff --git a/tests/test_hub/test_get_build_type.py b/tests/test_hub/test_get_build_type.py index 325386cd..0ab137a8 100644 --- a/tests/test_hub/test_get_build_type.py +++ b/tests/test_hub/test_get_build_type.py @@ -1,9 +1,5 @@ -from __future__ import absolute_import import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import kojihub diff --git a/tests/test_hub/test_get_external_repos.py b/tests/test_hub/test_get_external_repos.py index efb4e1b5..bd10a366 100644 --- a/tests/test_hub/test_get_external_repos.py +++ b/tests/test_hub/test_get_external_repos.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import koji import kojihub from .utils import DBQueryTestCase diff --git a/tests/test_hub/test_get_host.py b/tests/test_hub/test_get_host.py index 420e7e22..7bf38d01 100644 --- a/tests/test_hub/test_get_host.py +++ b/tests/test_hub/test_get_host.py @@ -1,9 +1,5 @@ -from __future__ import absolute_import import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import koji import kojihub diff --git a/tests/test_hub/test_get_next_release.py b/tests/test_hub/test_get_next_release.py index 15788999..ea1c0d5a 100644 --- a/tests/test_hub/test_get_next_release.py +++ b/tests/test_hub/test_get_next_release.py @@ -1,9 +1,5 @@ -from __future__ import absolute_import import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import koji import kojihub diff --git a/tests/test_hub/test_get_task_children.py b/tests/test_hub/test_get_task_children.py index eab40f65..6a1d449f 100644 --- a/tests/test_hub/test_get_task_children.py +++ b/tests/test_hub/test_get_task_children.py @@ -1,9 +1,5 @@ -from __future__ import absolute_import import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import koji import kojihub diff --git a/tests/test_hub/test_get_upload_path.py b/tests/test_hub/test_get_upload_path.py index 671e657b..b1cbed8d 100644 --- a/tests/test_hub/test_get_upload_path.py +++ b/tests/test_hub/test_get_upload_path.py @@ -1,12 +1,8 @@ -from __future__ import absolute_import import os import mock import shutil import tempfile -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import kojihub from koji import GenericError diff --git a/tests/test_hub/test_get_user_perms.py b/tests/test_hub/test_get_user_perms.py index 81ff47da..a9a712ab 100644 --- a/tests/test_hub/test_get_user_perms.py +++ b/tests/test_hub/test_get_user_perms.py @@ -1,9 +1,5 @@ -from __future__ import absolute_import import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import koji import kojihub diff --git a/tests/test_hub/test_get_verify_class.py b/tests/test_hub/test_get_verify_class.py index e733db63..4acaf71b 100644 --- a/tests/test_hub/test_get_verify_class.py +++ b/tests/test_hub/test_get_verify_class.py @@ -1,9 +1,5 @@ -from __future__ import absolute_import import hashlib -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import kojihub from koji import GenericError diff --git a/tests/test_hub/test_group_operations.py b/tests/test_hub/test_group_operations.py index 459c8023..90067e48 100644 --- a/tests/test_hub/test_group_operations.py +++ b/tests/test_hub/test_group_operations.py @@ -1,9 +1,5 @@ -from __future__ import absolute_import import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import koji import kojihub diff --git a/tests/test_hub/test_import_build.py b/tests/test_hub/test_import_build.py index 2422d9a2..aa535ee9 100644 --- a/tests/test_hub/test_import_build.py +++ b/tests/test_hub/test_import_build.py @@ -1,12 +1,8 @@ -from __future__ import absolute_import import copy import mock import shutil import tempfile -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import koji import kojihub diff --git a/tests/test_hub/test_import_image_internal.py b/tests/test_hub/test_import_image_internal.py index c96555ca..34895b6d 100644 --- a/tests/test_hub/test_import_image_internal.py +++ b/tests/test_hub/test_import_image_internal.py @@ -1,12 +1,8 @@ -from __future__ import absolute_import import mock import os import shutil import tempfile -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import kojihub diff --git a/tests/test_hub/test_insert_processor.py b/tests/test_hub/test_insert_processor.py index 1feaccda..697f7182 100644 --- a/tests/test_hub/test_insert_processor.py +++ b/tests/test_hub/test_insert_processor.py @@ -1,9 +1,5 @@ -from __future__ import absolute_import import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import koji import kojihub diff --git a/tests/test_hub/test_list_archive_files.py b/tests/test_hub/test_list_archive_files.py index 2234e555..87018e6c 100644 --- a/tests/test_hub/test_list_archive_files.py +++ b/tests/test_hub/test_list_archive_files.py @@ -1,9 +1,5 @@ -from __future__ import absolute_import import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import koji import kojihub diff --git a/tests/test_hub/test_list_archives.py b/tests/test_hub/test_list_archives.py index a70b5494..219d9728 100644 --- a/tests/test_hub/test_list_archives.py +++ b/tests/test_hub/test_list_archives.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import mock from .utils import DBQueryTestCase diff --git a/tests/test_hub/test_list_btypes.py b/tests/test_hub/test_list_btypes.py index 512a6729..6bc01946 100644 --- a/tests/test_hub/test_list_btypes.py +++ b/tests/test_hub/test_list_btypes.py @@ -1,9 +1,5 @@ -from __future__ import absolute_import import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import kojihub diff --git a/tests/test_hub/test_list_channels.py b/tests/test_hub/test_list_channels.py index 78149e7f..08479164 100644 --- a/tests/test_hub/test_list_channels.py +++ b/tests/test_hub/test_list_channels.py @@ -1,9 +1,5 @@ -from __future__ import absolute_import import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import koji import kojihub diff --git a/tests/test_hub/test_list_hosts.py b/tests/test_hub/test_list_hosts.py index 4c51da29..3fc346d4 100644 --- a/tests/test_hub/test_list_hosts.py +++ b/tests/test_hub/test_list_hosts.py @@ -1,9 +1,5 @@ -from __future__ import absolute_import import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import koji import kojihub diff --git a/tests/test_hub/test_list_task_output.py b/tests/test_hub/test_list_task_output.py index 4a5bcd32..7f4c5d32 100644 --- a/tests/test_hub/test_list_task_output.py +++ b/tests/test_hub/test_list_task_output.py @@ -1,9 +1,5 @@ -from __future__ import absolute_import import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import kojihub diff --git a/tests/test_hub/test_listing.py b/tests/test_hub/test_listing.py index b622be02..95cf8500 100644 --- a/tests/test_hub/test_listing.py +++ b/tests/test_hub/test_listing.py @@ -1,9 +1,5 @@ -from __future__ import absolute_import import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import kojihub diff --git a/tests/test_hub/test_new_build.py b/tests/test_hub/test_new_build.py index fea39c3e..6d95ebf3 100644 --- a/tests/test_hub/test_new_build.py +++ b/tests/test_hub/test_new_build.py @@ -1,9 +1,5 @@ -from __future__ import absolute_import import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import koji import kojihub diff --git a/tests/test_hub/test_new_typed_build.py b/tests/test_hub/test_new_typed_build.py index a0e93ba3..dec23f11 100644 --- a/tests/test_hub/test_new_typed_build.py +++ b/tests/test_hub/test_new_typed_build.py @@ -1,9 +1,5 @@ -from __future__ import absolute_import import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import kojihub diff --git a/tests/test_hub/test_notifications.py b/tests/test_hub/test_notifications.py index bbe0a62b..a95116ac 100644 --- a/tests/test_hub/test_notifications.py +++ b/tests/test_hub/test_notifications.py @@ -1,9 +1,5 @@ -from __future__ import absolute_import import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import koji import kojihub diff --git a/tests/test_hub/test_perm_operations.py b/tests/test_hub/test_perm_operations.py index fb8a584f..9db544ac 100644 --- a/tests/test_hub/test_perm_operations.py +++ b/tests/test_hub/test_perm_operations.py @@ -1,11 +1,7 @@ -from __future__ import absolute_import import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import koji import kojihub diff --git a/tests/test_hub/test_pkglist.py b/tests/test_hub/test_pkglist.py index f9f6c2aa..fa89a04a 100644 --- a/tests/test_hub/test_pkglist.py +++ b/tests/test_hub/test_pkglist.py @@ -1,9 +1,5 @@ -from __future__ import absolute_import import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import koji import kojihub diff --git a/tests/test_hub/test_policy_tests.py b/tests/test_hub/test_policy_tests.py index bc56fa59..bb153d74 100644 --- a/tests/test_hub/test_policy_tests.py +++ b/tests/test_hub/test_policy_tests.py @@ -1,9 +1,5 @@ -from __future__ import absolute_import import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import koji import kojihub diff --git a/tests/test_hub/test_query_processor.py b/tests/test_hub/test_query_processor.py index 570b2676..51e70a24 100644 --- a/tests/test_hub/test_query_processor.py +++ b/tests/test_hub/test_query_processor.py @@ -1,9 +1,5 @@ -from __future__ import absolute_import import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import kojihub diff --git a/tests/test_hub/test_recycle_build.py b/tests/test_hub/test_recycle_build.py index 007eaa35..8a9749cf 100644 --- a/tests/test_hub/test_recycle_build.py +++ b/tests/test_hub/test_recycle_build.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import mock import koji diff --git a/tests/test_hub/test_remove_host_from_channel.py b/tests/test_hub/test_remove_host_from_channel.py index db26349a..16b4b4cd 100644 --- a/tests/test_hub/test_remove_host_from_channel.py +++ b/tests/test_hub/test_remove_host_from_channel.py @@ -1,9 +1,5 @@ -from __future__ import absolute_import import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import koji import kojihub diff --git a/tests/test_hub/test_repos.py b/tests/test_hub/test_repos.py index 6cba32fa..771f0a96 100644 --- a/tests/test_hub/test_repos.py +++ b/tests/test_hub/test_repos.py @@ -1,10 +1,6 @@ -from __future__ import absolute_import import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import koji import kojihub diff --git a/tests/test_hub/test_rpmdiff.py b/tests/test_hub/test_rpmdiff.py index b69e7f5b..a6442391 100644 --- a/tests/test_hub/test_rpmdiff.py +++ b/tests/test_hub/test_rpmdiff.py @@ -1,11 +1,7 @@ -from __future__ import absolute_import import copy import mock import os -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import koji import kojihub diff --git a/tests/test_hub/test_savepoint.py b/tests/test_hub/test_savepoint.py index b0f91b0d..a77b609c 100644 --- a/tests/test_hub/test_savepoint.py +++ b/tests/test_hub/test_savepoint.py @@ -1,10 +1,6 @@ -from __future__ import absolute_import import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import kojihub diff --git a/tests/test_hub/test_set_host_enabled.py b/tests/test_hub/test_set_host_enabled.py index b2390802..fe8292f6 100644 --- a/tests/test_hub/test_set_host_enabled.py +++ b/tests/test_hub/test_set_host_enabled.py @@ -1,9 +1,5 @@ -from __future__ import absolute_import import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import koji import kojihub diff --git a/tests/test_hub/test_tag_operations.py b/tests/test_hub/test_tag_operations.py index e4123894..e67081f7 100644 --- a/tests/test_hub/test_tag_operations.py +++ b/tests/test_hub/test_tag_operations.py @@ -1,12 +1,5 @@ -from __future__ import absolute_import -import copy import mock -import shutil -import tempfile -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import koji import kojihub diff --git a/tests/test_hub/test_task_wait_results.py b/tests/test_hub/test_task_wait_results.py index 0dc72da9..65d2722a 100644 --- a/tests/test_hub/test_task_wait_results.py +++ b/tests/test_hub/test_task_wait_results.py @@ -1,10 +1,6 @@ -from __future__ import absolute_import import mock -import six.moves.xmlrpc_client -try: - import unittest2 as unittest -except ImportError: - import unittest +import xmlrpc.client +import unittest import koji import kojihub @@ -66,8 +62,8 @@ class TestTaskWaitResults(unittest.TestCase): task = self.getTask(t) task.getResult.return_value = "OK" task.isCanceled.return_value = False - self.tasks[6].getResult.side_effect = six.moves.xmlrpc_client.Fault(1, "error") - with self.assertRaises(six.moves.xmlrpc_client.Fault): + self.tasks[6].getResult.side_effect = xmlrpc.client.Fault(1, "error") + with self.assertRaises(xmlrpc.client.Fault): results = self.host_exports.taskWaitResults(parent, task_ids) self.assertEqual(results, []) self.tasks[6].getResult.side_effect = koji.GenericError('problem') diff --git a/tests/test_hub/test_update_processor.py b/tests/test_hub/test_update_processor.py index 95378841..94aca2a5 100644 --- a/tests/test_hub/test_update_processor.py +++ b/tests/test_hub/test_update_processor.py @@ -1,9 +1,5 @@ -from __future__ import absolute_import import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import kojihub diff --git a/tests/test_hub/test_user_groups.py b/tests/test_hub/test_user_groups.py index 98e5c939..c8a42409 100644 --- a/tests/test_hub/test_user_groups.py +++ b/tests/test_hub/test_user_groups.py @@ -1,9 +1,5 @@ -from __future__ import absolute_import import mock -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import koji import kojihub diff --git a/tests/test_hub/test_write_maven_repo_metadata.py b/tests/test_hub/test_write_maven_repo_metadata.py index 6f903856..51bb1f2f 100644 --- a/tests/test_hub/test_write_maven_repo_metadata.py +++ b/tests/test_hub/test_write_maven_repo_metadata.py @@ -1,11 +1,7 @@ -from __future__ import absolute_import, with_statement import mock import os import datetime -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest from kojihub import _write_maven_repo_metadata diff --git a/tests/test_hub/utils.py b/tests/test_hub/utils.py index 8a4fae93..4f5f6f3e 100644 --- a/tests/test_hub/utils.py +++ b/tests/test_hub/utils.py @@ -1,10 +1,5 @@ -from __future__ import absolute_import import mock -import six -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest import kojihub @@ -36,7 +31,7 @@ class DBQueryTestCase(unittest.TestCase): return query def assertQueryEqual(self, query, **kwargs): - for k, v in six.iteritems(kwargs): + for k, v in kwargs.items(): self.assertEqual(getattr(query, k, None), v) def assertLastQueryEqual(self, **kwargs): diff --git a/tests/test_www/loadwebindex.py b/tests/test_www/loadwebindex.py index 443ed203..faaee54b 100644 --- a/tests/test_www/loadwebindex.py +++ b/tests/test_www/loadwebindex.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import os import imp diff --git a/tests/test_www/test_taskinfo.py b/tests/test_www/test_taskinfo.py index 2e0c449e..eff2e7fa 100644 --- a/tests/test_www/test_taskinfo.py +++ b/tests/test_www/test_taskinfo.py @@ -1,16 +1,11 @@ -from __future__ import absolute_import -from __future__ import print_function import mock -import koji import copy import datetime - -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest from mock import call + +import koji from .loadwebindex import webidx diff --git a/tests/test_www/test_util.py b/tests/test_www/test_util.py index d3e1a05d..0ead026b 100644 --- a/tests/test_www/test_util.py +++ b/tests/test_www/test_util.py @@ -1,9 +1,4 @@ -from __future__ import absolute_import - -try: - import unittest2 as unittest -except ImportError: - import unittest +import unittest from kojiweb.util import formatMode