diff options
author | Matt Clay <matt@mystile.com> | 2016-12-06 23:07:58 -0500 |
---|---|---|
committer | Toshio Kuratomi <a.badger@gmail.com> | 2016-12-07 15:38:57 -0800 |
commit | e87d147244a349aced2704741aa354c62a783b5d (patch) | |
tree | 2ac935646931a38016cd6541c39243d17803bfe7 | |
parent | e90a085cd0c43cb7dbea575a48c58d059dd63f1e (diff) | |
download | ansible-e87d147244a349aced2704741aa354c62a783b5d.tar.gz |
Relocate module unit tests. (#18812)
* Relocate module unit tests.
* Fix classification of unit test changes.
-rw-r--r-- | test/runner/lib/classification.py | 16 | ||||
-rw-r--r-- | test/units/modules/cloud/__init__.py (renamed from test/units/modules/core/__init__.py) | 0 | ||||
-rw-r--r-- | test/units/modules/cloud/amazon/__init__.py (renamed from test/units/modules/core/cloud/__init__.py) | 0 | ||||
-rw-r--r-- | test/units/modules/cloud/amazon/test_ec2_vpc_nat_gateway.py (renamed from test/units/modules/extras/cloud/amazon/test_ec2_vpc_nat_gateway.py) | 0 | ||||
-rw-r--r-- | test/units/modules/cloud/amazon/test_kinesis_stream.py (renamed from test/units/modules/extras/cloud/amazon/test_kinesis_stream.py) | 0 | ||||
-rw-r--r-- | test/units/modules/cloud/docker/__init__.py (renamed from test/units/modules/core/cloud/docker/__init__.py) | 0 | ||||
-rw-r--r-- | test/units/modules/cloud/docker/test_docker.py (renamed from test/units/modules/core/cloud/docker/test_docker.py) | 0 | ||||
-rw-r--r-- | test/units/modules/cloud/openstack/__init__.py (renamed from test/units/modules/core/cloud/openstack/__init__.py) | 0 | ||||
-rw-r--r-- | test/units/modules/cloud/openstack/test_os_server.py (renamed from test/units/modules/core/cloud/openstack/test_os_server.py) | 0 | ||||
-rw-r--r-- | test/units/modules/extras/__init__.py | 0 | ||||
-rw-r--r-- | test/units/modules/extras/cloud/__init__.py | 0 | ||||
-rw-r--r-- | test/units/modules/extras/cloud/amazon/__init__.py | 0 | ||||
-rw-r--r-- | test/units/modules/packaging/__init__.py (renamed from test/units/modules/core/packaging/__init__.py) | 0 | ||||
-rw-r--r-- | test/units/modules/packaging/os/__init__.py (renamed from test/units/modules/core/packaging/os/__init__.py) | 0 | ||||
-rw-r--r-- | test/units/modules/packaging/os/test_apt.py (renamed from test/units/modules/core/packaging/os/test_apt.py) | 0 |
15 files changed, 12 insertions, 4 deletions
diff --git a/test/runner/lib/classification.py b/test/runner/lib/classification.py index a3cce21292..ee56e7853c 100644 --- a/test/runner/lib/classification.py +++ b/test/runner/lib/classification.py @@ -81,7 +81,7 @@ class PathMapper(object): self.compile_paths = set(t.path for t in self.compile_targets) self.units_modules = set(t.module for t in self.units_targets if t.module) - self.units_paths = set(t.path for t in self.units_targets) + self.units_paths = set(a for t in self.units_targets for a in t.aliases) self.sanity_paths = set(t.path for t in self.sanity_targets) self.module_names_by_path = dict((t.path, t.module) for t in self.module_targets) @@ -280,9 +280,17 @@ class PathMapper(object): 'units': path, } - return { - 'units': '%s/' % os.path.dirname(path), - } + # changes to files which are not unit tests should trigger tests from the nearest parent directory + + test_path = os.path.dirname(path) + + while test_path: + if test_path + '/' in self.units_paths: + return { + 'units': test_path + '/', + } + + test_path = os.path.dirname(test_path) if path.startswith('test/runner/'): return all_tests() # test infrastructure, run all tests diff --git a/test/units/modules/core/__init__.py b/test/units/modules/cloud/__init__.py index e69de29bb2..e69de29bb2 100644 --- a/test/units/modules/core/__init__.py +++ b/test/units/modules/cloud/__init__.py diff --git a/test/units/modules/core/cloud/__init__.py b/test/units/modules/cloud/amazon/__init__.py index e69de29bb2..e69de29bb2 100644 --- a/test/units/modules/core/cloud/__init__.py +++ b/test/units/modules/cloud/amazon/__init__.py diff --git a/test/units/modules/extras/cloud/amazon/test_ec2_vpc_nat_gateway.py b/test/units/modules/cloud/amazon/test_ec2_vpc_nat_gateway.py index f274b70114..f274b70114 100644 --- a/test/units/modules/extras/cloud/amazon/test_ec2_vpc_nat_gateway.py +++ b/test/units/modules/cloud/amazon/test_ec2_vpc_nat_gateway.py diff --git a/test/units/modules/extras/cloud/amazon/test_kinesis_stream.py b/test/units/modules/cloud/amazon/test_kinesis_stream.py index efddfece7c..efddfece7c 100644 --- a/test/units/modules/extras/cloud/amazon/test_kinesis_stream.py +++ b/test/units/modules/cloud/amazon/test_kinesis_stream.py diff --git a/test/units/modules/core/cloud/docker/__init__.py b/test/units/modules/cloud/docker/__init__.py index e69de29bb2..e69de29bb2 100644 --- a/test/units/modules/core/cloud/docker/__init__.py +++ b/test/units/modules/cloud/docker/__init__.py diff --git a/test/units/modules/core/cloud/docker/test_docker.py b/test/units/modules/cloud/docker/test_docker.py index 0a40cfb8db..0a40cfb8db 100644 --- a/test/units/modules/core/cloud/docker/test_docker.py +++ b/test/units/modules/cloud/docker/test_docker.py diff --git a/test/units/modules/core/cloud/openstack/__init__.py b/test/units/modules/cloud/openstack/__init__.py index e69de29bb2..e69de29bb2 100644 --- a/test/units/modules/core/cloud/openstack/__init__.py +++ b/test/units/modules/cloud/openstack/__init__.py diff --git a/test/units/modules/core/cloud/openstack/test_os_server.py b/test/units/modules/cloud/openstack/test_os_server.py index 3ab3e40580..3ab3e40580 100644 --- a/test/units/modules/core/cloud/openstack/test_os_server.py +++ b/test/units/modules/cloud/openstack/test_os_server.py diff --git a/test/units/modules/extras/__init__.py b/test/units/modules/extras/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/units/modules/extras/__init__.py +++ /dev/null diff --git a/test/units/modules/extras/cloud/__init__.py b/test/units/modules/extras/cloud/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/units/modules/extras/cloud/__init__.py +++ /dev/null diff --git a/test/units/modules/extras/cloud/amazon/__init__.py b/test/units/modules/extras/cloud/amazon/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 --- a/test/units/modules/extras/cloud/amazon/__init__.py +++ /dev/null diff --git a/test/units/modules/core/packaging/__init__.py b/test/units/modules/packaging/__init__.py index e69de29bb2..e69de29bb2 100644 --- a/test/units/modules/core/packaging/__init__.py +++ b/test/units/modules/packaging/__init__.py diff --git a/test/units/modules/core/packaging/os/__init__.py b/test/units/modules/packaging/os/__init__.py index e69de29bb2..e69de29bb2 100644 --- a/test/units/modules/core/packaging/os/__init__.py +++ b/test/units/modules/packaging/os/__init__.py diff --git a/test/units/modules/core/packaging/os/test_apt.py b/test/units/modules/packaging/os/test_apt.py index f1b6f170f0..f1b6f170f0 100644 --- a/test/units/modules/core/packaging/os/test_apt.py +++ b/test/units/modules/packaging/os/test_apt.py |