Merge pull request #4758 from mwichmann/test/multi-suffix

Add tests to FSTests

Author: bdbaddog

CHANGES.txt

@@ -173,6 +173,8 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
       Python binary (for odd Windows setups + Python launcher)
     - Improve the wording of AppendENVPath and PrependENVPath in manpage.
     - Add more unit tests to internal AppendPath, PrependPath functions.
+    - Add unit tests to show .filebase method strips only the last suffix if
+      several apparent suffixes are present, and .suffix returns the last.
 
 
 RELEASE 4.9.1 -  Thu, 27 Mar 2025 11:40:20 -0700

SCons/Node/FSTests.py

@@ -3842,6 +3842,7 @@ def runTest(self) -> None:
         fs = SCons.Node.FS.FS(test.workpath('work'))
 
         f = fs.Entry('foo/bar/baz.blat').get_subst_proxy()
+        f2 = fs.Entry('foo/bar/baz.blat.qux').get_subst_proxy()
 
         s = str(f.dir)
         assert s == os.path.normpath('foo/bar'), s
@@ -3866,12 +3867,16 @@ def runTest(self) -> None:
         assert f.filebase.is_literal(), f.filebase
         for_sig = f.filebase.for_signature()
         assert for_sig == 'baz.blat_filebase', for_sig
+        s = str(f2.filebase)
+        assert s == 'baz.blat', s
 
         s = str(f.suffix)
         assert s == '.blat', s
         assert f.suffix.is_literal(), f.suffix
         for_sig = f.suffix.for_signature()
         assert for_sig == 'baz.blat_suffix', for_sig
+        s = str(f2.suffix)
+        assert s == '.qux', s
 
         s = str(f.get_abspath())
         assert s == test.workpath('work', 'foo', 'bar', 'baz.blat'), s