Fix tests after repo merge.

test/units/modules/core/cloud/docker/test_docker.py

@@ -2,7 +2,7 @@ import collections
 import os
 import unittest
 
-from ansible.modules.core.cloud.docker._docker import get_split_image_tag
+from ansible.modules.cloud.docker._docker import get_split_image_tag
 
 class DockerSplitImageTagTestCase(unittest.TestCase):
 

test/units/modules/core/cloud/openstack/test_os_server.py

@@ -4,7 +4,7 @@ import yaml
 import inspect
 import collections
 
-from ansible.modules.core.cloud.openstack import os_server
+from ansible.modules.cloud.openstack import os_server
 
 
 class AnsibleFail(Exception):

test/units/modules/core/packaging/os/test_apt.py

@@ -6,7 +6,7 @@ from ansible.compat.tests import mock
 from ansible.compat.tests import unittest
 
 try:
-    from ansible.modules.core.packaging.os.apt import (
+    from ansible.modules.packaging.os.apt import (
         expand_pkgspec_from_fnmatches,
     )
 except:

test/units/modules/extras/cloud/amazon/test_ec2_vpc_nat_gateway.py

@@ -19,7 +19,7 @@ from ansible.inventory import Inventory
 from ansible.playbook.play import Play
 from ansible.executor.task_queue_manager import TaskQueueManager
 
-import ansible.modules.extras.cloud.amazon.ec2_vpc_nat_gateway as ng
+import ansible.modules.cloud.amazon.ec2_vpc_nat_gateway as ng
 
 Options = (
     namedtuple(

test/units/modules/extras/cloud/amazon/test_kinesis_stream.py

@@ -12,7 +12,7 @@ if not HAS_BOTO3:
 
 import unittest
 
-import ansible.modules.extras.cloud.amazon.kinesis_stream as kinesis_stream
+import ansible.modules.cloud.amazon.kinesis_stream as kinesis_stream
 
 aws_region = 'us-west-2'