fix: test new fix

Author: iMichka

src/pygccxml/parser/project_reader.py

@@ -353,7 +353,12 @@ def __parse_all_at_once(self, files):
                 header_content.append(
                     '#include "%s" %s' %
                     (header, os.linesep))
-        return self.read_string(''.join(header_content))
+        declarations = self.read_string(''.join(header_content))
+        declarations = self._join_top_namespaces(declarations, [])
+        for ns in declarations:
+            if isinstance(ns, pygccxml.declarations.namespace_t):
+                declarations_joiner.join_declarations(ns)
+        return declarations
 
     def read_string(self, content):
         """Parse a string containing C/C++ source code.
@@ -419,20 +424,25 @@ def read_xml(self, file_configuration):
     @staticmethod
     def _join_top_namespaces(main_ns_list, other_ns_list):
         answer = main_ns_list[:]
-        for n in main_ns_list:
-            print("_join_top_namespaces", n, n.name)
-        print("--------------")
         for other_ns in other_ns_list:
-            print("_join_top_namespaces", other_ns, other_ns.name)
-            main_ns = pygccxml.declarations.find_declaration(
+            same_name_namespaces = pygccxml.declarations.find_all_declarations(
                 answer,
                 decl_type=pygccxml.declarations.namespace_t,
-                name=other_ns._name,
-                recursive=False)
-            if main_ns:
-                main_ns.take_parenting(other_ns)
-            else:
+                name=other_ns.name,
+                parent=None,  # top-level only
+                recursive=False
+            )
+            if len(same_name_namespaces) == 0:
                 answer.append(other_ns)
+            elif len(same_name_namespaces) == 1:
+                same_name_namespaces[0].take_parenting(other_ns)
+            else:
+                primary_ns = same_name_namespaces[0]
+                for extra_ns in same_name_namespaces[1:]:
+                    primary_ns.take_parenting(extra_ns)
+                    answer.remove(extra_ns)
+                # then unify the new other_ns
+                primary_ns.take_parenting(other_ns)
         return answer
 
     @staticmethod

tests/test_core.py

@@ -222,15 +222,14 @@ def global_ns(request):
 @pytest.mark.parametrize(
     "global_ns",
     [
-        # "global_ns_fixture_all_at_once1",
-        # "global_ns_fixture_all_at_once2",
+        "global_ns_fixture_all_at_once1",
+        "global_ns_fixture_all_at_once2",
         "global_ns_fixture_file_by_file1",
-        # "global_ns_fixture_file_by_file2",
+        "global_ns_fixture_file_by_file2",
     ],
     indirect=True,
 )
 def test_mangled_name_namespace(global_ns):
     std = global_ns.namespace("std")
     assert std is not None
     assert std.mangled is None
-    raise