tests: pass ly_yang_module_dir() explicitly where needed

Upstream libyang now unconditionally needs ietf-yang-semver and its
deps, and they are not available as builtins in the library, one has to
load them via the usual lookups from disk instead. Let's adapt our tests
for this.

Signed-off-by: Jan Kundrát <jan.kundrat@cesnet.cz>
Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com>

Author: jktjkt

cffi/cdefs.h

@@ -40,6 +40,7 @@ typedef enum {
 LY_ERR ly_ctx_new(const char *, uint16_t, struct ly_ctx **);
 void ly_ctx_destroy(struct ly_ctx *);
 int ly_ctx_set_searchdir(struct ly_ctx *, const char *);
+const char *ly_yang_module_dir(void);
 
 typedef enum
 {

tests/test_context.py

@@ -4,24 +4,34 @@
 import os
 import unittest
 
+from _libyang import lib
 from libyang import Context, LibyangError, Module, SContainer, SLeaf, SLeafList
 from libyang.util import c2str
 
 
 YANG_DIR = os.path.join(os.path.dirname(__file__), "yang")
 
+# Since libyang 6.3.0, ly_ctx_new() loads several core modules
+# (ietf-yang-semver and friends) that are no longer embedded in the
+# library - they must be resolvable via the normal search-dir
+# mechanism, same as any import. Tests below that deliberately point
+# Context() at a missing/empty/no search path still need this one
+# added explicitly, or context creation itself fails before the test
+# gets to exercise what it actually wants to test.
+CORE_MODULE_DIR = c2str(lib.ly_yang_module_dir())
+
 
 # -------------------------------------------------------------------------------------
 
 
 class ContextTest(unittest.TestCase):
     def test_ctx_no_dir(self):
-        with Context() as ctx:
+        with Context(CORE_MODULE_DIR) as ctx:
             self.assertIsNot(ctx, None)
 
     def test_ctx_yanglib(self):
         ctx = Context(
-            YANG_DIR,
+            ":".join([YANG_DIR, CORE_MODULE_DIR]),
             yanglib_path=YANG_DIR + "/yang-library.json",
             compile_obsolete=True,
         )
@@ -42,11 +52,11 @@ def test_ctx_duplicate_searchpath(self):
             self.fail("Context.__init__ should not raise LibyangError")
 
     def test_ctx_invalid_dir(self):
-        with Context("/does/not/exist") as ctx:
+        with Context(":".join(["/does/not/exist", CORE_MODULE_DIR])) as ctx:
             self.assertIsNot(ctx, None)
 
     def test_ctx_missing_dir(self):
-        with Context(os.path.join(YANG_DIR, "yolo")) as ctx:
+        with Context(":".join([os.path.join(YANG_DIR, "yolo"), CORE_MODULE_DIR])) as ctx:
             self.assertIsNot(ctx, None)
             with self.assertRaises(LibyangError):
                 ctx.load_module("yolo-system")
@@ -56,7 +66,9 @@ def test_ctx_env_search_dir(self):
             os.environ["YANGPATH"] = ":".join(
                 [os.path.join(YANG_DIR, "omg"), os.path.join(YANG_DIR, "wtf")]
             )
-            with Context(os.path.join(YANG_DIR, "yolo")) as ctx:
+            with Context(
+                ":".join([os.path.join(YANG_DIR, "yolo"), CORE_MODULE_DIR])
+            ) as ctx:
                 mod = ctx.load_module("yolo-system")
                 self.assertIsInstance(mod, Module)
         finally:

tests/test_diff.py

@@ -4,6 +4,7 @@
 import os
 import unittest
 
+from _libyang import lib
 from libyang import (
     BaseTypeAdded,
     BaseTypeRemoved,
@@ -21,11 +22,17 @@
     StatusRemoved,
     schema_diff,
 )
+from libyang.util import c2str
 
 
 OLD_YANG_DIR = os.path.join(os.path.dirname(__file__), "yang-old")
 NEW_YANG_DIR = os.path.join(os.path.dirname(__file__), "yang")
 
+# yang-old/ doesn't carry its own copy of the core modules that
+# ly_ctx_new() now loads unconditionally (see test_context.py's
+# CORE_MODULE_DIR) - add libyang's install-tree copy explicitly.
+CORE_MODULE_DIR = c2str(lib.ly_yang_module_dir())
+
 
 # -------------------------------------------------------------------------------------
 class DiffTest(unittest.TestCase):
@@ -97,9 +104,9 @@ class DiffTest(unittest.TestCase):
     )
 
     def test_diff(self):
-        with Context(OLD_YANG_DIR, compile_obsolete=True) as ctx_old, Context(
-            NEW_YANG_DIR, compile_obsolete=True
-        ) as ctx_new:
+        with Context(
+            ":".join([OLD_YANG_DIR, CORE_MODULE_DIR]), compile_obsolete=True
+        ) as ctx_old, Context(NEW_YANG_DIR, compile_obsolete=True) as ctx_new:
             mod = ctx_old.load_module("yolo-system")
             mod.feature_enable_all()
             mod = ctx_new.load_module("yolo-system")