Revert "edtlib: test "last modified" semantic for ... specs"
This unit test was added to cover the change introduced by [1].
Further work on related issues [2] showed that the chosen approach
is dead end.
We're reverting all changes made in [1].
[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 70eaa61cb0.
Signed-off-by: Christophe Dufaza <chris@openmarl.org>
This commit is contained in:
parent
308b568219
commit
0b946dfc01
4 changed files with 0 additions and 47 deletions
|
|
@ -1,7 +0,0 @@
|
||||||
# SPDX-License-Identifier: BSD-3-Clause
|
|
||||||
|
|
||||||
properties:
|
|
||||||
x:
|
|
||||||
type: int
|
|
||||||
y:
|
|
||||||
type: int
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
# SPDX-License-Identifier: BSD-3-Clause
|
|
||||||
|
|
||||||
include: base.yaml
|
|
||||||
|
|
||||||
properties:
|
|
||||||
x:
|
|
||||||
required: true
|
|
||||||
|
|
@ -1,21 +0,0 @@
|
||||||
# SPDX-License-Identifier: BSD-3-Clause
|
|
||||||
|
|
||||||
description: |
|
|
||||||
Top-level binding file for testing included property spec paths.
|
|
||||||
|
|
||||||
base.yaml: specifies properties "x" and "y"
|
|
||||||
modified.yaml: includes base.yaml, modifies property "x"
|
|
||||||
top.yaml (this file): includes modified.yaml, specifies property "p"
|
|
||||||
|
|
||||||
From the top-level binding, we expect:
|
|
||||||
- "x" was last modified in modified.yaml
|
|
||||||
- "y" was last modified in base.yaml
|
|
||||||
- "p" was last modified in top.yaml
|
|
||||||
|
|
||||||
compatible: top-level
|
|
||||||
|
|
||||||
include: modified.yaml
|
|
||||||
|
|
||||||
properties:
|
|
||||||
p:
|
|
||||||
type: int
|
|
||||||
|
|
@ -365,18 +365,6 @@ def test_include_filters():
|
||||||
assert set(child.prop2specs.keys()) == {'child-prop-1', 'child-prop-2',
|
assert set(child.prop2specs.keys()) == {'child-prop-1', 'child-prop-2',
|
||||||
'x', 'z'} # root level 'y' is blocked
|
'x', 'z'} # root level 'y' is blocked
|
||||||
|
|
||||||
def test_include_paths():
|
|
||||||
'''Test "last modified" semantic for included bindings paths.'''
|
|
||||||
|
|
||||||
fname2path = {'base.yaml': 'test-bindings-include/base.yaml',
|
|
||||||
'modified.yaml': 'test-bindings-include/modified.yaml'}
|
|
||||||
|
|
||||||
with from_here():
|
|
||||||
top = edtlib.Binding('test-bindings-include/top.yaml', fname2path)
|
|
||||||
|
|
||||||
assert 'modified.yaml' == os.path.basename(top.prop2specs["x"].path)
|
|
||||||
assert 'base.yaml' == os.path.basename(top.prop2specs["y"].path)
|
|
||||||
assert 'top.yaml' == os.path.basename(top.prop2specs["p"].path)
|
|
||||||
|
|
||||||
def test_bus():
|
def test_bus():
|
||||||
'''Test 'bus:' and 'on-bus:' in bindings'''
|
'''Test 'bus:' and 'on-bus:' in bindings'''
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue