Skip to content

Commit 308b568

Browse files
dottspinammahadevan108
authored andcommitted
Revert "edtlib: test filters set by including bindings"
This unit test was added specifically to cover a regression reported by the CI while working on [1]. Further work on related issues [2] showed that: - [1] and [2] are dead end: we need to first rethink how bindings (and especially child-bindings) are initialized - the inclusion mechanism supported by Zephyr deserves more systematic testing in edtlib if we want to work with confidence The approach we choose is to: - revert all changes made in [1] - from there, systematically add unit tests as we address the issues we identified (or the additional features we need) one after the other [1] edtlib: fix last modified semantic in included property specs [2] edtlib: Preserve paths of properties from included child bindings See also: #65221, #78095 This reverts commit 33bb3b6. Signed-off-by: Christophe Dufaza <[email protected]>
1 parent ec10d56 commit 308b568

File tree

4 files changed

+0
-40
lines changed

4 files changed

+0
-40
lines changed

scripts/dts/python-devicetree/tests/test-bindings-include/inc-base.yaml

Lines changed: 0 additions & 3 deletions
This file was deleted.

scripts/dts/python-devicetree/tests/test-bindings-include/top-allows.yaml

Lines changed: 0 additions & 10 deletions
This file was deleted.

scripts/dts/python-devicetree/tests/test-bindings-include/top-blocks.yaml

Lines changed: 0 additions & 10 deletions
This file was deleted.

scripts/dts/python-devicetree/tests/test_edtlib.py

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -378,23 +378,6 @@ def test_include_paths():
378378
assert 'base.yaml' == os.path.basename(top.prop2specs["y"].path)
379379
assert 'top.yaml' == os.path.basename(top.prop2specs["p"].path)
380380

381-
def test_include_filters_included_bindings():
382-
'''Test filters set by including bindings.'''
383-
fname2path = {'base.yaml': 'test-bindings-include/base.yaml',
384-
'inc-base.yaml': 'test-bindings-include/inc-base.yaml'}
385-
386-
with from_here():
387-
top_allows = edtlib.Binding('test-bindings-include/top-allows.yaml', fname2path)
388-
assert top_allows.prop2specs.get("x")
389-
assert not top_allows.prop2specs.get("y")
390-
391-
with from_here():
392-
top_blocks = edtlib.Binding('test-bindings-include/top-blocks.yaml', fname2path)
393-
assert not top_blocks.prop2specs.get("x")
394-
assert top_blocks.prop2specs.get("y")
395-
396-
397-
398381
def test_bus():
399382
'''Test 'bus:' and 'on-bus:' in bindings'''
400383
with from_here():

0 commit comments

Comments
 (0)