Skip to content

Commit 1c1728b

Browse files
committed
tests: fix failures caused by libyang v5 changes
Add missing ietf-inet-types YANG module to the test search path, as libyang v5 no longer resolves it automatically. Update the module data callback test to handle the ietf-inet-types dependency, and adjust expected error paths to match libyang v5 output. Signed-off-by: Antonio Prcela <antonio.prcela@gmail.com>
1 parent ba03028 commit 1c1728b

3 files changed

Lines changed: 469 additions & 7 deletions

File tree

tests/test_context.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,14 @@ def test_ctx_disable_searchdirs(self):
154154

155155
def test_ctx_using_clb(self):
156156
def get_module_valid_clb(mod_name, *_):
157-
YOLO_NODETYPES_MOD_PATH = os.path.join(YANG_DIR, "yolo/yolo-nodetypes.yang")
158-
self.assertEqual(mod_name, "yolo-nodetypes")
159-
with open(YOLO_NODETYPES_MOD_PATH, encoding="utf-8") as f:
157+
MOD_PATHS = {
158+
"yolo-nodetypes": os.path.join(YANG_DIR, "yolo/yolo-nodetypes.yang"),
159+
"ietf-inet-types": os.path.join(
160+
YANG_DIR, "ietf/ietf-inet-types@2013-07-15.yang"
161+
),
162+
}
163+
self.assertIn(mod_name, MOD_PATHS)
164+
with open(MOD_PATHS[mod_name], encoding="utf-8") as f:
160165
mod_str = f.read()
161166
return "yang", mod_str
162167

tests/test_data.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -288,21 +288,21 @@ def test_data_parse_config_xml_multi_error(self):
288288
self.assertEqual(
289289
str(cm.exception),
290290
'failed to parse data tree: Invalid boolean value "abcd".: '
291-
"Data path: /yolo-system:conf/url[proto='https']/enabled (line 6): "
291+
"Data path: /yolo-system:url[proto='https']/enabled (line 6): "
292292
'List instance is missing its key "host".: '
293-
"Data path: /yolo-system:conf/url[proto='https'] (line 7)",
293+
"Data path: /yolo-system:url[proto='https'] (line 7)",
294294
)
295295

296296
first = cm.exception.errors[0]
297297
self.assertEqual(first.msg, 'Invalid boolean value "abcd".')
298298
self.assertEqual(
299-
first.data_path, "/yolo-system:conf/url[proto='https']/enabled"
299+
first.data_path, "/yolo-system:url[proto='https']/enabled"
300300
)
301301
self.assertEqual(first.line, 6)
302302

303303
second = cm.exception.errors[1]
304304
self.assertEqual(second.msg, 'List instance is missing its key "host".')
305-
self.assertEqual(second.data_path, "/yolo-system:conf/url[proto='https']")
305+
self.assertEqual(second.data_path, "/yolo-system:url[proto='https']")
306306
self.assertEqual(second.line, 7)
307307

308308
XML_STATE = """<state xmlns="urn:yang:yolo:system">

0 commit comments

Comments
 (0)