diff options
| author | Matt Clay <matt@mystile.com> | 2023-05-17 09:07:04 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-17 09:07:04 -0700 |
| commit | b16041f1a91bb74b7adbf2ad1f1af25603151cb3 (patch) | |
| tree | f580eaa484288d8b095f3fd1e87d68f61b62fa14 /test/lib/ansible_test/_internal/data.py | |
| parent | 2fd64161c1ae4a8930e9b6094804ac9976a9f2ad (diff) | |
| download | ansible-b16041f1a91bb74b7adbf2ad1f1af25603151cb3.tar.gz | |
ansible-test - Fix traceback when mixing sources (#80801)
* ansible-test - Fix traceback when mixing sources
* ansible-test - Refactor layout error handling
Diffstat (limited to 'test/lib/ansible_test/_internal/data.py')
| -rw-r--r-- | test/lib/ansible_test/_internal/data.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/test/lib/ansible_test/_internal/data.py b/test/lib/ansible_test/_internal/data.py index 379ee7b011..67f7a06ce3 100644 --- a/test/lib/ansible_test/_internal/data.py +++ b/test/lib/ansible_test/_internal/data.py @@ -10,7 +10,6 @@ from .util import ( ApplicationError, import_plugins, is_subdir, - is_valid_identifier, ANSIBLE_LIB_ROOT, ANSIBLE_TEST_ROOT, ANSIBLE_SOURCE_ROOT, @@ -219,12 +218,8 @@ class DataContext: elif 'ansible_collections' not in cwd.split(os.path.sep): blocks.append('No "ansible_collections" parent directory was found.') - if self.content.collection: - if not is_valid_identifier(self.content.collection.namespace): - blocks.append(f'The namespace "{self.content.collection.namespace}" is an invalid identifier or a reserved keyword.') - - if not is_valid_identifier(self.content.collection.name): - blocks.append(f'The name "{self.content.collection.name}" is an invalid identifier or a reserved keyword.') + if isinstance(self.content.unsupported, list): + blocks.extend(self.content.unsupported) message = '\n'.join(blocks) |