cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Ensure unit test paths for connection and inventory plugins are based on the context (#73877)

Browse source
This commit is contained in:
Mark Chappell 2021-03-12 21:46:40 +01:00 committed by Matt Clay
parent 3dcdde996c
commit 7ef1a2f830
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/73876-ansible_test-units.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- ansible-test - ensure unit test paths for connection and inventory plugins are correctly identified for collections (https://github.com/ansible/ansible/issues/73876).

8
test/lib/ansible_test/_internal/classification.py
View file

@ -521,15 +521,16 @@ class PathMapper:
} }
if is_subdir(path, data_context().content.plugin_paths['connection']): if is_subdir(path, data_context().content.plugin_paths['connection']):
units_dir = os.path.join(data_context().content.unit_path, 'plugins', 'connection')
if name == '__init__': if name == '__init__':
return { return {
'integration': self.integration_all_target, 'integration': self.integration_all_target,
'windows-integration': self.integration_all_target, 'windows-integration': self.integration_all_target,
'network-integration': self.integration_all_target, 'network-integration': self.integration_all_target,
'units': 'test/units/plugins/connection/', 'units': units_dir,
} }
units_path = 'test/units/plugins/connection/test_%s.py' % name units_path = os.path.join(units_dir, 'test_%s.py' % name)
if units_path not in self.units_paths: if units_path not in self.units_paths:
units_path = None units_path = None
@ -605,7 +606,8 @@ class PathMapper:
posix_integration_fallback = None posix_integration_fallback = None
target = self.integration_targets_by_name.get('inventory_%s' % name) target = self.integration_targets_by_name.get('inventory_%s' % name)
units_path = 'test/units/plugins/inventory/test_%s.py' % name units_dir = os.path.join(data_context().content.unit_path, 'plugins', 'inventory')
units_path = os.path.join(units_dir, 'test_%s.py' % name)
if units_path not in self.units_paths: if units_path not in self.units_paths:
units_path = None units_path = None