Fixes mbj4668#518 - broken xpath check

cisco-ie · Nov 20, 2019 · bf0bf09 · bf0bf09
1 parent 4435dfe
commit bf0bf09
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 3 deletions.
diff --git a/pyang/xpath.py b/pyang/xpath.py
@@ -249,11 +249,14 @@ def chk_xpath_path(ctx, mod, pos, initial, node, path):
                 else:
                     node1 = child
         elif axis == 'parent' and nodetest == ('node_type', 'node'):
-            p = data_node_up(node)
-            if p is None:
+            if node == 'root':
                 err_add(ctx.errors, pos, 'XPATH_PATH_TOO_MANY_UP', ())
             else:
-                node1 = p
+                p = data_node_up(node)
+                if p is None:
+                    err_add(ctx.errors, pos, 'XPATH_PATH_TOO_MANY_UP', ())
+                else:
+                    node1 = p
         else:
             # we can't validate the steps on other axis, but we can validate
             # functions etc.

diff --git a/test/test_issues/test_i518/Makefile b/test/test_issues/test_i518/Makefile
@@ -0,0 +1,2 @@
+test:
+	pyang s.yang --print-error-code 2>&1 | diff s.expect -
diff --git a/test/test_issues/test_i518/s.expect b/test/test_issues/test_i518/s.expect
@@ -0,0 +1 @@
+s.yang:12: error: XPATH_PATH_TOO_MANY_UP
diff --git a/test/test_issues/test_i518/s.yang b/test/test_issues/test_i518/s.yang
@@ -0,0 +1,19 @@
+submodule s {
+  belongs-to a {
+    prefix a;
+  }
+
+  container test;
+
+  augment "/test" {
+    container x {
+      container test-1 {
+        leaf tcp-profile {
+          when "/../../test/protocol = 'test'";
+          type string;
+        }
+      }
+    }
+  }
+}
+
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		test:
		pyang s.yang --print-error-code 2>&1 \| diff s.expect -