mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-05-07 05:42:50 +00:00
Move unit test compat code out of lib/ansible/. (#46996)
* Move ansible.compat.tests to test/units/compat/. * Fix unit test references to ansible.compat.tests. * Move builtins compat to separate file. * Fix classification of test/units/compat/ dir.
This commit is contained in:
@@ -19,8 +19,8 @@
|
||||
from __future__ import (absolute_import, division)
|
||||
__metaclass__ = type
|
||||
|
||||
from ansible.compat.tests import unittest
|
||||
from ansible.compat.tests.mock import Mock
|
||||
from units.compat import unittest
|
||||
from units.compat.mock import Mock
|
||||
|
||||
|
||||
class BaseFactsTest(unittest.TestCase):
|
||||
|
||||
@@ -18,8 +18,8 @@ __metaclass__ = type
|
||||
|
||||
import os
|
||||
|
||||
from ansible.compat.tests import unittest
|
||||
from ansible.compat.tests.mock import Mock, patch
|
||||
from units.compat import unittest
|
||||
from units.compat.mock import Mock, patch
|
||||
|
||||
from ansible.module_utils.facts import timeout
|
||||
|
||||
|
||||
@@ -18,8 +18,8 @@
|
||||
from __future__ import (absolute_import, division)
|
||||
__metaclass__ = type
|
||||
|
||||
from ansible.compat.tests.mock import Mock
|
||||
from ansible.compat.tests import unittest
|
||||
from units.compat.mock import Mock
|
||||
from units.compat import unittest
|
||||
|
||||
from ansible.module_utils.facts.network import generic_bsd
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
from __future__ import (absolute_import, division)
|
||||
__metaclass__ = type
|
||||
|
||||
from ansible.compat.tests.mock import Mock, patch
|
||||
from units.compat.mock import Mock, patch
|
||||
|
||||
from .. base import BaseFactsTest
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
from __future__ import (absolute_import, division)
|
||||
__metaclass__ = type
|
||||
|
||||
from ansible.compat.tests.mock import Mock, patch
|
||||
from units.compat.mock import Mock, patch
|
||||
|
||||
from .. base import BaseFactsTest
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
from __future__ import (absolute_import, division)
|
||||
__metaclass__ = type
|
||||
|
||||
from ansible.compat.tests.mock import Mock, patch
|
||||
from units.compat.mock import Mock, patch
|
||||
|
||||
from .. base import BaseFactsTest
|
||||
|
||||
|
||||
@@ -20,8 +20,8 @@ from __future__ import (absolute_import, division)
|
||||
__metaclass__ = type
|
||||
|
||||
# for testing
|
||||
from ansible.compat.tests import unittest
|
||||
from ansible.compat.tests.mock import Mock, patch
|
||||
from units.compat import unittest
|
||||
from units.compat.mock import Mock, patch
|
||||
|
||||
from ansible.module_utils.facts import collector
|
||||
from ansible.module_utils.facts import ansible_collector
|
||||
|
||||
@@ -24,7 +24,7 @@ from collections import defaultdict
|
||||
import pprint
|
||||
|
||||
# for testing
|
||||
from ansible.compat.tests import unittest
|
||||
from units.compat import unittest
|
||||
|
||||
from ansible.module_utils.facts import collector
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
from __future__ import (absolute_import, division)
|
||||
__metaclass__ = type
|
||||
|
||||
from ansible.compat.tests.mock import Mock, patch
|
||||
from units.compat.mock import Mock, patch
|
||||
|
||||
from . base import BaseFactsTest
|
||||
|
||||
|
||||
@@ -25,8 +25,8 @@ import os
|
||||
import pytest
|
||||
|
||||
# for testing
|
||||
from ansible.compat.tests import unittest
|
||||
from ansible.compat.tests.mock import Mock, patch
|
||||
from units.compat import unittest
|
||||
from units.compat.mock import Mock, patch
|
||||
|
||||
from ansible.module_utils import facts
|
||||
from ansible.module_utils.facts import hardware
|
||||
|
||||
@@ -24,8 +24,8 @@ import time
|
||||
|
||||
import pytest
|
||||
|
||||
from ansible.compat.tests import unittest
|
||||
from ansible.compat.tests.mock import patch, MagicMock
|
||||
from units.compat import unittest
|
||||
from units.compat.mock import patch, MagicMock
|
||||
|
||||
from ansible.module_utils.facts import timeout
|
||||
|
||||
|
||||
@@ -17,8 +17,8 @@
|
||||
from __future__ import (absolute_import, division)
|
||||
__metaclass__ = type
|
||||
|
||||
from ansible.compat.tests import unittest
|
||||
from ansible.compat.tests.mock import patch
|
||||
from units.compat import unittest
|
||||
from units.compat.mock import patch
|
||||
|
||||
from ansible.module_utils.facts import utils
|
||||
|
||||
|
||||
Reference in New Issue
Block a user