diff --git a/avocado/core/test.py b/avocado/core/test.py index 4dbf90b39c5c3dbaaa9a4f17737396ce6ef8f034..0d5d86d99307115ce4805b8ecede5259edd78bb4 100644 --- a/avocado/core/test.py +++ b/avocado/core/test.py @@ -26,6 +26,7 @@ import re import shutil import sys import time +import unittest from . import data_dir from . import exceptions @@ -42,11 +43,6 @@ from ..utils import stacktrace from .settings import settings from .version import VERSION -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest - #: Environment variable used to store the location of a temporary #: directory which is preserved across all tests execution (usually in diff --git a/selftests/doc/test_doc_build.py b/selftests/doc/test_doc_build.py index 9b68ee941c05d6f8a86c85c9069ac0947c15c169..c88221c9503eaf5be22feea321dfdc32934daa56 100644 --- a/selftests/doc/test_doc_build.py +++ b/selftests/doc/test_doc_build.py @@ -4,13 +4,8 @@ Build documentation and report whether we had warning/error messages. This is geared towards documentation build regression testing. """ import os -import sys import urllib - -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest +import unittest from avocado.utils import process diff --git a/selftests/functional/test_argument_parsing.py b/selftests/functional/test_argument_parsing.py index 2a42e1d69c61f78c5c378e50ed5499609a9c94f6..464f36b87a2db2a867f0bfd88f420f0cde20beac 100644 --- a/selftests/functional/test_argument_parsing.py +++ b/selftests/functional/test_argument_parsing.py @@ -1,11 +1,6 @@ import os -import sys import glob - -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest +import unittest from avocado.core import data_dir from avocado.core import job_id diff --git a/selftests/functional/test_basic.py b/selftests/functional/test_basic.py index 00e8a1b0b3a6540370199f27de1665b8ffe8217d..028416102b203ab6cfb8b56e58918225a687f66b 100644 --- a/selftests/functional/test_basic.py +++ b/selftests/functional/test_basic.py @@ -11,14 +11,10 @@ import tempfile import time import xml.dom.minidom import zipfile +import unittest import pkg_resources -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest - from avocado.core import exit_codes from avocado.utils import astring from avocado.utils import process diff --git a/selftests/functional/test_export_variables.py b/selftests/functional/test_export_variables.py index d3b267948840b70b202a60f14e31e9e034018ae6..4821493f997b1731c66af9342ad367d3f5ac9c79 100644 --- a/selftests/functional/test_export_variables.py +++ b/selftests/functional/test_export_variables.py @@ -1,12 +1,7 @@ import os -import sys import tempfile import shutil - -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest +import unittest from avocado import VERSION from avocado.core import exit_codes diff --git a/selftests/functional/test_gdb.py b/selftests/functional/test_gdb.py index 28619e5d7eb6859d3376652ed5ac456c7ce217e8..6ee39a57c7a3c6f04b51803938a7cd75da485395 100644 --- a/selftests/functional/test_gdb.py +++ b/selftests/functional/test_gdb.py @@ -1,12 +1,7 @@ import os -import sys import shutil import tempfile - -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest +import unittest from avocado.utils import process diff --git a/selftests/functional/test_interrupt.py b/selftests/functional/test_interrupt.py index dbe1919333faaafe538197eaba27f043ab416200..c14d0fd5b02cbe477d94148a9a47cf990a39f8b7 100644 --- a/selftests/functional/test_interrupt.py +++ b/selftests/functional/test_interrupt.py @@ -1,18 +1,13 @@ import os -import sys import tempfile import time import shutil import stat +import unittest import aexpect import psutil -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest - from avocado.utils import wait from avocado.utils import script from avocado.utils import data_factory diff --git a/selftests/functional/test_job_timeout.py b/selftests/functional/test_job_timeout.py index 4bea8a506da60703d7016a553dee791d629aa9df..06bc630b0c4a66db1678265a2567f28dcf47efd2 100644 --- a/selftests/functional/test_job_timeout.py +++ b/selftests/functional/test_job_timeout.py @@ -1,14 +1,9 @@ import glob import os -import sys import tempfile import shutil import xml.dom.minidom - -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest +import unittest from avocado.core import exit_codes from avocado.utils import process diff --git a/selftests/functional/test_journal.py b/selftests/functional/test_journal.py index bcf7f44a033b9aa9fe2138d4f3df4db3288186b3..0655c8db13ead147527d9034b101a9f3e4d642f6 100644 --- a/selftests/functional/test_journal.py +++ b/selftests/functional/test_journal.py @@ -1,14 +1,9 @@ import os -import sys import json import sqlite3 import tempfile import shutil - -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest +import unittest from avocado.core import exit_codes from avocado.utils import process diff --git a/selftests/functional/test_loader.py b/selftests/functional/test_loader.py index 231687e250a0ff0040a41c928332cb3dffcb3a5d..01ab58933036d5ff6dfb3c54821d94ff6b26689e 100644 --- a/selftests/functional/test_loader.py +++ b/selftests/functional/test_loader.py @@ -1,16 +1,11 @@ import os -import sys import subprocess import time import stat import tempfile import shutil import signal - -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest +import unittest from avocado.core import exit_codes from avocado.utils import script diff --git a/selftests/functional/test_lv_utils.py b/selftests/functional/test_lv_utils.py index 91d2c7bf30bb97c1c7cfc00aa2f4798a04b80534..8cfcf1587113b47e432617647d8750c5151b6e28 100644 --- a/selftests/functional/test_lv_utils.py +++ b/selftests/functional/test_lv_utils.py @@ -7,17 +7,10 @@ from avocado.utils import process, lv_utils import glob import os import shutil -import sys import tempfile import unittest -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest - - class LVUtilsTest(unittest.TestCase): """ diff --git a/selftests/functional/test_multiplex.py b/selftests/functional/test_multiplex.py index 8dc89fdfb4d66fababcba8c326017acb5b500ce8..3372ce95a38a1ad6569f9cb8e0003a7b51c7d1a0 100644 --- a/selftests/functional/test_multiplex.py +++ b/selftests/functional/test_multiplex.py @@ -1,14 +1,9 @@ #!/usr/bin/env python import os -import sys import tempfile import shutil - -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest +import unittest from avocado.core import exit_codes from avocado.utils import process diff --git a/selftests/functional/test_output.py b/selftests/functional/test_output.py index 657fa32243c96efebb0354f5a4974d0d21f95eed..f2c1507d497c02d4766e9059888657284203e291 100644 --- a/selftests/functional/test_output.py +++ b/selftests/functional/test_output.py @@ -2,17 +2,12 @@ import json import tempfile import os import re -import sys import shutil +import unittest from xml.dom import minidom import pkg_resources -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest - from avocado.core import exit_codes from avocado.core.output import TermSupport from avocado.utils import process diff --git a/selftests/functional/test_output_check.py b/selftests/functional/test_output_check.py index 459f2dfeb30e595229cd2ffa1e7db09b6b79862b..d854c87fde006ba2d059585de9cc3f6986711e5d 100644 --- a/selftests/functional/test_output_check.py +++ b/selftests/functional/test_output_check.py @@ -1,12 +1,7 @@ import os -import sys import tempfile import shutil - -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest +import unittest from avocado.core import exit_codes from avocado.utils import process diff --git a/selftests/functional/test_plugin_diff.py b/selftests/functional/test_plugin_diff.py index da7d6041b11a644375dd660c0f6419f5eb0f7d49..27d355a856c2f3aca1273e9887287f5f78b4d180 100644 --- a/selftests/functional/test_plugin_diff.py +++ b/selftests/functional/test_plugin_diff.py @@ -2,14 +2,9 @@ import glob import os -import sys import tempfile import shutil - -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest +import unittest from avocado.core import exit_codes from avocado.utils import process diff --git a/selftests/functional/test_plugin_jobscripts.py b/selftests/functional/test_plugin_jobscripts.py index e873be59abe4af6754461048b62d1dc13755878e..0ace07c0b00b91923a638b7e140a00254f2c04df 100644 --- a/selftests/functional/test_plugin_jobscripts.py +++ b/selftests/functional/test_plugin_jobscripts.py @@ -1,12 +1,7 @@ import os import shutil -import sys import tempfile - -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest +import unittest from avocado.core import exit_codes from avocado.utils import process diff --git a/selftests/functional/test_replay_basic.py b/selftests/functional/test_replay_basic.py index b31fcafe20e7aa3c9cc964ee79d2e92054a30d8d..70e2b29fcdfab3c1667b9c6dda4a9a24c4c7e027 100644 --- a/selftests/functional/test_replay_basic.py +++ b/selftests/functional/test_replay_basic.py @@ -2,14 +2,9 @@ import glob import os -import sys import tempfile import shutil - -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest +import unittest from avocado.core import exit_codes from avocado.utils import process diff --git a/selftests/functional/test_replay_external_runner.py b/selftests/functional/test_replay_external_runner.py index 61be5c31a0aa58e7413378cfd014e3fc7a6b5d30..7d13d60fcd286fec2aced87ce9814aeaf86c8c1b 100644 --- a/selftests/functional/test_replay_external_runner.py +++ b/selftests/functional/test_replay_external_runner.py @@ -2,14 +2,9 @@ import glob import os -import sys import tempfile import shutil - -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest +import unittest from avocado.core import exit_codes from avocado.utils import process diff --git a/selftests/functional/test_replay_failfast.py b/selftests/functional/test_replay_failfast.py index de06d4653d4288b224276dba8f9b662963ccc9c1..65f037b3454c068936a270f39f6c0f1339bf55b3 100644 --- a/selftests/functional/test_replay_failfast.py +++ b/selftests/functional/test_replay_failfast.py @@ -2,14 +2,9 @@ import glob import os -import sys import tempfile import shutil - -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest +import unittest from avocado.core import exit_codes from avocado.utils import process diff --git a/selftests/functional/test_skiptests.py b/selftests/functional/test_skiptests.py index b09e3a88a87fc5b4f2476b89df90bd672dfebbd5..e9676da8264069e4cf2b4d15537ece1a04782f70 100644 --- a/selftests/functional/test_skiptests.py +++ b/selftests/functional/test_skiptests.py @@ -1,13 +1,8 @@ import json import os import shutil -import sys import tempfile - -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest +import unittest from avocado.core import exit_codes from avocado.utils import process diff --git a/selftests/functional/test_standalone.py b/selftests/functional/test_standalone.py index 1f3fe38ac0c90a3de4ce80efd9d0e6b89f508597..8ab24c4979f9b3df1f4ef19d745e3a7848b0bd13 100644 --- a/selftests/functional/test_standalone.py +++ b/selftests/functional/test_standalone.py @@ -1,10 +1,5 @@ import os -import sys - -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest +import unittest from avocado.core import exit_codes from avocado.utils import process diff --git a/selftests/functional/test_streams.py b/selftests/functional/test_streams.py index 087f2441ceac0461e50b83d352aa3e9f89bbeb8f..dd955f3f5e7b507ec0872e6513d071accec24423 100644 --- a/selftests/functional/test_streams.py +++ b/selftests/functional/test_streams.py @@ -1,12 +1,7 @@ import os import shutil -import sys import tempfile - -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest +import unittest from avocado.core import exit_codes from avocado.utils import process diff --git a/selftests/functional/test_sysinfo.py b/selftests/functional/test_sysinfo.py index 7c882836175c77b58b3122f36d360bf8314eee09..1810802a95b10c87d505f5a0d5641ad211ba1d5d 100644 --- a/selftests/functional/test_sysinfo.py +++ b/selftests/functional/test_sysinfo.py @@ -1,12 +1,7 @@ import os -import sys import shutil import tempfile - -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest +import unittest from avocado.core import exit_codes from avocado.utils import process diff --git a/selftests/functional/test_teststmpdir.py b/selftests/functional/test_teststmpdir.py index 9f5bc555aabb2d07933f062202a3d13df0b82151..fdcce0a5d619b7a0a448cc32a381678c7f2c30b1 100644 --- a/selftests/functional/test_teststmpdir.py +++ b/selftests/functional/test_teststmpdir.py @@ -1,14 +1,9 @@ #!/usr/bin/env python import os -import sys import tempfile import shutil - -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest +import unittest from avocado.core import exit_codes from avocado.core import test diff --git a/selftests/functional/test_thirdparty_bugs.py b/selftests/functional/test_thirdparty_bugs.py index b0e2face1163058e0b7c380e778222e26f2070a1..acbccc1d36b81e65f8b9abbe10a36c724e318794 100644 --- a/selftests/functional/test_thirdparty_bugs.py +++ b/selftests/functional/test_thirdparty_bugs.py @@ -1,11 +1,8 @@ import json -import sys -from avocado.utils import download +import unittest +import urllib2 -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest +from avocado.utils import download class TestThirdPartyBugs(unittest.TestCase): @@ -25,7 +22,7 @@ class TestThirdPartyBugs(unittest.TestCase): 'change the avocado.conf option ' '"reject_unknown_hosts" defaults to True.' % 'https://github.com/paramiko/paramiko/issues/243') - except download.urllib2.URLError as details: + except urllib2.URLError as details: raise unittest.SkipTest(details) diff --git a/selftests/functional/test_unittest_compat.py b/selftests/functional/test_unittest_compat.py index e4c64933692380b5fd1a5fe6361d605b82522de2..a42a32d3647e9c365a87b9b6f5c142ca683b25e5 100644 --- a/selftests/functional/test_unittest_compat.py +++ b/selftests/functional/test_unittest_compat.py @@ -2,11 +2,7 @@ import os import sys import shutil import tempfile - -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest +import unittest from avocado.utils import script from avocado.utils import process diff --git a/selftests/functional/test_utils.py b/selftests/functional/test_utils.py index e2c470cfb0f0ea4b270880e4b4c6d7f8d8af0de4..7a5090c124725eba00f4591a224dac88e30142f1 100644 --- a/selftests/functional/test_utils.py +++ b/selftests/functional/test_utils.py @@ -6,16 +6,10 @@ import stat import sys import tempfile import time +import unittest from avocado.utils.filelock import FileLock from avocado.utils.stacktrace import prepare_exc_info - - -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest - from avocado.utils import process diff --git a/selftests/functional/test_wrapper.py b/selftests/functional/test_wrapper.py index 0743a6faf8ed720446bc5f475ba55ad204ab01b7..e6f6bb186efbc3b1eb20e8ff4a05acaef2893e46 100644 --- a/selftests/functional/test_wrapper.py +++ b/selftests/functional/test_wrapper.py @@ -1,18 +1,14 @@ import os -import sys import tempfile import shutil - -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest +import unittest from avocado.core import exit_codes from avocado.utils import process from avocado.utils import script from avocado.utils import path as utils_path + basedir = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', '..') basedir = os.path.abspath(basedir) diff --git a/selftests/run b/selftests/run index a05af3c4c05b9d761300488525244dcc7782c0d3..7bd62373ce857bc400a868fb7b5202c394b5559d 100755 --- a/selftests/run +++ b/selftests/run @@ -6,12 +6,7 @@ __author__ = 'Lucas Meneghel Rodrigues ' import os import sys import logging - - -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest +import unittest logger = logging.getLogger(__name__) diff --git a/selftests/unit/test_data_structures.py b/selftests/unit/test_data_structures.py index af161a2933c73f1144b941ceb4ffa5c9d37e54c0..92bb916e4e6779a05fd3c6443e43fb3f7a8af120 100644 --- a/selftests/unit/test_data_structures.py +++ b/selftests/unit/test_data_structures.py @@ -1,8 +1,4 @@ -import sys -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest +import unittest from avocado.utils import data_structures diff --git a/selftests/unit/test_dispatcher.py b/selftests/unit/test_dispatcher.py index 2c99366894c89863909eaa1da91c60607b58b588..dc9bfcba9003566ba4cfbd5418feeac5541122b6 100644 --- a/selftests/unit/test_dispatcher.py +++ b/selftests/unit/test_dispatcher.py @@ -1,9 +1,4 @@ -import sys - -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest +import unittest from avocado.core import dispatcher diff --git a/selftests/unit/test_job.py b/selftests/unit/test_job.py index 5beefc3769973528d285e53bf0216fc20efc1b35..bd6d22f3cf4b2b670c4cc8302f1f3035127d684a 100644 --- a/selftests/unit/test_job.py +++ b/selftests/unit/test_job.py @@ -1,12 +1,8 @@ import argparse import os import shutil -import sys import tempfile -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest +import unittest from avocado.core import exceptions from avocado.core import test diff --git a/selftests/unit/test_loader.py b/selftests/unit/test_loader.py index ff90593a72b6703b029f9d50c2c28a9c3664faf7..244a4a3d11745aa3bba63e409a6952a9daff8f8f 100644 --- a/selftests/unit/test_loader.py +++ b/selftests/unit/test_loader.py @@ -1,13 +1,8 @@ import shutil import stat -import sys import multiprocessing import tempfile - -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest +import unittest from avocado.core import test from avocado.core import exceptions diff --git a/selftests/unit/test_mux.py b/selftests/unit/test_mux.py index ca303339d6e39df8ef3102a9341f5a39a1286a51..2757fd0fe9be0b5c003a004cfcb6e07f6808d374 100644 --- a/selftests/unit/test_mux.py +++ b/selftests/unit/test_mux.py @@ -1,16 +1,12 @@ import copy import itertools import pickle -import sys +import unittest from avocado.core import mux, tree, varianter from avocado.plugins import yaml_to_mux -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest if __name__ == "__main__": PATH_PREFIX = "../../../../" else: diff --git a/selftests/unit/test_parser.py b/selftests/unit/test_parser.py index 52caa27efad5c801fdadbb3d2cfc8c771bd98cfa..2b6a51cfb528c7475be4f3369873ceb0e2b1ffb6 100644 --- a/selftests/unit/test_parser.py +++ b/selftests/unit/test_parser.py @@ -1,10 +1,5 @@ import argparse -import sys - -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest +import unittest from avocado.core import parser diff --git a/selftests/unit/test_result.py b/selftests/unit/test_result.py index 89854d9dee570099e5949661b640faf7dd5573aa..0a2f4e3e9c21fc41be3eeaea3d814e98eab8e303 100644 --- a/selftests/unit/test_result.py +++ b/selftests/unit/test_result.py @@ -1,9 +1,5 @@ -import sys import argparse -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest +import unittest from avocado.core.result import Result diff --git a/selftests/unit/test_safeloader.py b/selftests/unit/test_safeloader.py index 62f1855fe7082a7e6701e35f37a9592c7856ec3d..b70e9ffb5d12d7b64ccc51e3956024980d8c0679 100644 --- a/selftests/unit/test_safeloader.py +++ b/selftests/unit/test_safeloader.py @@ -1,11 +1,6 @@ import ast import re -import sys - -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest +import unittest from avocado.core import safeloader from avocado.utils import script diff --git a/selftests/unit/test_settings.py b/selftests/unit/test_settings.py index 812cb946ca5423137b3f69efcf3adfb25c4e7f10..67418177277ba2d29c2178f0b6da58dd84337329 100644 --- a/selftests/unit/test_settings.py +++ b/selftests/unit/test_settings.py @@ -1,11 +1,6 @@ import os -import sys import tempfile - -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest +import unittest from avocado.core import settings diff --git a/selftests/unit/test_sysinfo.py b/selftests/unit/test_sysinfo.py index 05d6b4566415817a23bf6a8805ee9eb4329642b9..ecd9ae57d209d9e583bfd44bf0b1ce7c6c8fd834 100644 --- a/selftests/unit/test_sysinfo.py +++ b/selftests/unit/test_sysinfo.py @@ -1,12 +1,7 @@ import os -import sys import tempfile import shutil - -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest +import unittest from avocado.core import sysinfo diff --git a/selftests/unit/test_test.py b/selftests/unit/test_test.py index 9c07db16ffa5b7d451232de23f315202ae152c4c..dd92180b7e368dc58052ba9ed3d944dd36b54c11 100644 --- a/selftests/unit/test_test.py +++ b/selftests/unit/test_test.py @@ -1,13 +1,9 @@ import os import shutil -import sys import tempfile -from flexmock import flexmock, flexmock_teardown +import unittest -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest +from flexmock import flexmock, flexmock_teardown from avocado.core import test, exceptions from avocado.utils import script diff --git a/selftests/unit/test_utils_iso9660.py b/selftests/unit/test_utils_iso9660.py index e4a0f4aa6c604fe5c6a571b2bf3f745114b966eb..cf60ab9083a038abaa5997f8acbb8f41f8a77e74 100644 --- a/selftests/unit/test_utils_iso9660.py +++ b/selftests/unit/test_utils_iso9660.py @@ -3,18 +3,12 @@ Verifies the avocado.utils.iso9660 functionality """ import os import shutil -import sys import tempfile +import unittest from avocado.utils import iso9660, process -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest - - class BaseIso9660(unittest.TestCase): """ diff --git a/selftests/unit/test_utils_partition.py b/selftests/unit/test_utils_partition.py index 4f8aea7a493b1d88a85e0141d81f84369aa599ab..d1e2bf14b9f7cbe44a2d364741a2b56c7f845f34 100644 --- a/selftests/unit/test_utils_partition.py +++ b/selftests/unit/test_utils_partition.py @@ -6,20 +6,15 @@ avocado.utils.partition unittests import os import shutil -import sys import tempfile import time +import unittest # pylint: disable=C0411 from flexmock import flexmock, flexmock_teardown from avocado.utils import partition, process from avocado.utils import path as utils_path -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest # pylint: disable=E0401 -else: - import unittest # pylint: disable=C0411 - def missing_binary(binary): try: diff --git a/selftests/unit/test_utils_process.py b/selftests/unit/test_utils_process.py index cc20879bbf1ed1d73c93b5ceadf904c77488f0a9..543b699de855f1ab2b9a28c7fa5ec7a5b1db8a57 100644 --- a/selftests/unit/test_utils_process.py +++ b/selftests/unit/test_utils_process.py @@ -1,12 +1,7 @@ import os -import sys +import unittest from mock import MagicMock, patch -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest - from avocado.utils import gdb from avocado.utils import process from avocado.utils import path diff --git a/selftests/unit/test_utils_service.py b/selftests/unit/test_utils_service.py index f669c365da341352639a90d7f5123fbc2a22a7f1..7ddce8c151f33509815ecb94ddca6bb787abb248 100644 --- a/selftests/unit/test_utils_service.py +++ b/selftests/unit/test_utils_service.py @@ -16,12 +16,7 @@ # The full GNU General Public License is included in this distribution in # the file called "COPYING". -import sys - -if sys.version_info[:2] == (2, 6): - import unittest2 as unittest -else: - import unittest +import unittest from mock import MagicMock, patch