From a9542209570af63f3203019dcf1780f88a57e0b2 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Tue, 21 Oct 2014 01:14:30 -0400 Subject: [PATCH] Migrate the v2/tests to use the ansible.compat module --- v2/test/compat.py | 56 ------------------------------- v2/test/errors/test_errors.py | 5 +-- v2/test/parsing/test_general.py | 2 +- v2/test/parsing/test_mod_args.py | 2 +- v2/test/parsing/yaml/test_yaml.py | 2 +- v2/test/playbook/test_block.py | 2 +- v2/test/playbook/test_role.py | 2 +- v2/test/playbook/test_task.py | 2 +- 8 files changed, 9 insertions(+), 64 deletions(-) delete mode 100644 v2/test/compat.py diff --git a/v2/test/compat.py b/v2/test/compat.py deleted file mode 100644 index 6930de94b0c..00000000000 --- a/v2/test/compat.py +++ /dev/null @@ -1,56 +0,0 @@ -# (c) 2012-2014, Michael DeHaan -# -# This file is part of Ansible -# -# Ansible is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Ansible is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Ansible. If not, see . - -# Make coding more python3-ish -from __future__ import (absolute_import, division, print_function) -__metaclass__ = type - -import sys -import unittest - -# -# Compat for python2.6 -# - -if sys.version_info < (2, 7): - try: - # Need unittest2 on python2.6 - import unittest2 as unittest - except ImportError: - print('You need unittest2 installed on python2.x') -else: - import unittest - - -# -# Compat for python2.7 -# - -# Could use the pypi mock library on py3 as well as py2. They are the same -try: - from unittest.mock import mock_open, patch -except ImportError: - # Python2 - from mock import mock_open, patch - -try: - import __builtin__ -except ImportError: - BUILTINS = 'builtins' -else: - BUILTINS = '__builtin__' - diff --git a/v2/test/errors/test_errors.py b/v2/test/errors/test_errors.py index 60ba7eb858b..6088f3bd5ee 100644 --- a/v2/test/errors/test_errors.py +++ b/v2/test/errors/test_errors.py @@ -19,12 +19,13 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type -from .. compat import unittest +from ansible.compat.tests import unittest from ansible.parsing.yaml.objects import AnsibleBaseYAMLObject from ansible.errors import AnsibleError -from .. compat import BUILTINS, mock_open, patch +from ansible.compat.tests import BUILTINS +from ansible.compat.tests.mock import mock_open, patch class TestErrors(unittest.TestCase): diff --git a/v2/test/parsing/test_general.py b/v2/test/parsing/test_general.py index b86fcba289a..5ccefd3b504 100644 --- a/v2/test/parsing/test_general.py +++ b/v2/test/parsing/test_general.py @@ -19,7 +19,7 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type -from .. compat import unittest +from ansible.compat.tests import unittest from ansible.parsing import load_data from ansible.errors import AnsibleParserError diff --git a/v2/test/parsing/test_mod_args.py b/v2/test/parsing/test_mod_args.py index e593522aa82..8268e6126b9 100644 --- a/v2/test/parsing/test_mod_args.py +++ b/v2/test/parsing/test_mod_args.py @@ -21,7 +21,7 @@ __metaclass__ = type from ansible.parsing.mod_args import ModuleArgsParser -from .. compat import unittest +from ansible.compat.tests import unittest class TestModArgsDwim(unittest.TestCase): diff --git a/v2/test/parsing/yaml/test_yaml.py b/v2/test/parsing/yaml/test_yaml.py index 6b1d09d741d..c468ef6d6fa 100644 --- a/v2/test/parsing/yaml/test_yaml.py +++ b/v2/test/parsing/yaml/test_yaml.py @@ -19,7 +19,7 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type -from ... compat import unittest +from ansible.compat.tests import unittest from yaml.scanner import ScannerError diff --git a/v2/test/playbook/test_block.py b/v2/test/playbook/test_block.py index 46921ae6d20..ccb8f2b6d3c 100644 --- a/v2/test/playbook/test_block.py +++ b/v2/test/playbook/test_block.py @@ -21,7 +21,7 @@ __metaclass__ = type from ansible.playbook.block import Block from ansible.playbook.task import Task -from .. compat import unittest +from ansible.compat.tests import unittest class TestBlock(unittest.TestCase): diff --git a/v2/test/playbook/test_role.py b/v2/test/playbook/test_role.py index 55e170de24e..f2236f7fc0a 100644 --- a/v2/test/playbook/test_role.py +++ b/v2/test/playbook/test_role.py @@ -22,7 +22,7 @@ __metaclass__ = type from ansible.playbook.block import Block from ansible.playbook.role import Role from ansible.playbook.task import Task -from .. compat import unittest +from ansible.compat.tests import unittest class TestRole(unittest.TestCase): diff --git a/v2/test/playbook/test_task.py b/v2/test/playbook/test_task.py index 487bca207b0..0af53c9117b 100644 --- a/v2/test/playbook/test_task.py +++ b/v2/test/playbook/test_task.py @@ -20,7 +20,7 @@ from __future__ import (absolute_import, division, print_function) __metaclass__ = type from ansible.playbook.task import Task -from .. compat import unittest +from ansible.compat.tests import unittest basic_shell_task = dict( name = 'Test Task',