Fix metadata test.

Author: abellgithub

pdal/plang/Environment.cpp

@@ -299,16 +299,21 @@ void addMetadata(PyObject *dict, MetadataNode m)
     if (type.empty())
         type = Metadata::inferType(value);
 
-    m = m.addWithType(name, value, type, description);
+    m.addWithType(name, value, type, description);
     PyObject *submeta = PyDict_GetItemString(dict, "children");
     if (submeta)
     {
         if (!PyList_Check(submeta))
             throw pdal::pdal_error("Ouput metadata 'children' must be a list.");
-        for (Py_ssize_t i = 0; i < PyList_Size(submeta); ++i)
+        Py_ssize_t size = PyList_Size(submeta);
+        if (size)
         {
-            PyObject* p = PyList_GetItem(submeta, i);
-            addMetadata(p, m);
+            m = m.add("children");
+            for (Py_ssize_t i = 0; i < PyList_Size(submeta); ++i)
+            {
+                PyObject* p = PyList_GetItem(submeta, i);
+                addMetadata(p, m);
+            }
         }
     }
 }

pdal/test/PythonFilterTest.cpp

@@ -223,7 +223,7 @@ TEST_F(PythonFilterTest, metadata)
         "import sys\n"
         "import redirector\n"
         "def myfunc(ins,outs):\n"
-        "  global metadata\n"
+        "  global out_metadata\n"
         "  #print('before', globals(),  file=sys.stderr,)\n"
         "  out_metadata = {'name': 'root', 'value': 'a string', 'type': 'string', 'description': 'a description', 'children': [{'name': 'somechildren', 'value': 52, 'type': 'integer', 'description': 'a filter description', 'children': []}, {'name': 'otherchildren', 'value': 'another string', 'type': 'string', 'description': 'a reader description', 'children': []}]}\n"
         " # print ('schema', schema, file=sys.stderr,)\n"
@@ -248,13 +248,13 @@ TEST_F(PythonFilterTest, metadata)
 
     PointLayoutPtr layout(table.layout());
     MetadataNode m = table.metadata();
-    m = m.findChild("somechildren");
-    Utils::toJSON(m, std::cerr);
+    m = m.findChild("filters.python");
     MetadataNodeList l = m.children();
-    EXPECT_EQ(l.size(), 3u);
-    EXPECT_EQ(l[0].name(), "filters.python");
-    EXPECT_EQ(l[0].value(), "52");
-    EXPECT_EQ(l[0].description(), "a filter description");
+    EXPECT_EQ(l.size(), 2u);
+    m = m.findChild("children");
+    EXPECT_EQ(m.children().size(), 2u);
+    m = m.findChild("somechildren");
+    EXPECT_EQ(m.value(), "52");
 }
 
 TEST_F(PythonFilterTest, pdalargs)