Merge branch 'fix_expand_dbd' into 'master'

E3-1215: Fix issue with multiple records that include dbCommon.dbd

See merge request e3/e3-require!133

require-ess/tools/expandDBD

@@ -39,9 +39,10 @@ def open_dbd_file(current_file, filename, includes=None):
     if dbd_file is None:
         print("File '{basename}' not found".format(basename=basename), file=sys.stderr)
         sys.exit(1)
-    SCANNED_FILES.add(basename)
+    if basename != "dbCommon.dbd":
+        SCANNED_FILES.add(basename)
     with open(dbd_file, "r") as f:
-        return [line.strip() for line in f.readlines()]
+        return [line.rstrip() for line in f.readlines()]
 
 
 def expand_dbd_file(current_file, dbdlines, includes):

tests/test_expand_dbd.py

@@ -60,6 +60,23 @@ def test_skip_repeated_includes(tmp_path, expanddbdtcl):
     assert "Info: skipping duplicate file b.dbd included from" in result.stderr
 
 
+def test_do_not_skip_repeated_include_common_dbd(tmp_path, expanddbdtcl):
+    dbd_a = tmp_path / "a.dbd"
+    dbd_a.write_text("include dbCommon.dbd\ninclude dbCommon.dbd")
+
+    dbd_b = tmp_path / "dbCommon.dbd"
+    dbd_b.write_text("content")
+
+    result = subprocess.run(
+        [expanddbdtcl, "-I", str(tmp_path), dbd_a],
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+        encoding="utf-8",
+    )
+    assert result.returncode == 0
+    assert result.stdout == "content\ncontent\n"
+
+
 def test_record_names_from_dbds(tmp_path, expanddbdtcl):
     dbd_a = tmp_path / "a.dbd"
     dbd_a.write_text("include aRecord.dbd")