From 4712b6313a4e4ee137303b9bb8df86e577069fc6 Mon Sep 17 00:00:00 2001
From: Vyron Vasileiadis <hi@fedonman.com>
Date: Sat, 18 Jul 2026 16:09:34 +0300
Subject: [PATCH 1/7] gh-153953: Increase test coverage for the wave module

Add tests for previously-uncovered paths in Lib/wave.py, all reachable
through the public API:

* Wave_write parameter validation: rejecting bad channel counts, sample
  widths, compression types and formats; the "not set" errors from the
  getters; the "cannot change parameters after starting to write" guards
  on every setter; and tell().
* Wave_read error handling: rejecting an unknown WAVE_FORMAT_EXTENSIBLE
  subformat, raising EOFError on a truncated fmt chunk, skipping unknown
  chunks, getfp(), and closing the file when opening a malformed path
  fails.
* wave.open() rejecting an invalid mode.

This raises line coverage of Lib/wave.py under test_wave from 317 to 345
of 449 executable lines. Test-only change; no behavior change.
---
 Lib/test/test_wave.py | 167 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 167 insertions(+)

diff --git a/Lib/test/test_wave.py b/Lib/test/test_wave.py
index d3723c04820d9d..fb04bdae528715 100644
--- a/Lib/test/test_wave.py
+++ b/Lib/test/test_wave.py
@@ -475,5 +475,172 @@ def test_open_pathlike(self):
                         pass
 
 
+class WaveReadErrorTest(unittest.TestCase):
+    """Cover error and edge paths of Wave_read, _Chunk and wave.open()."""
+
+    FMT_PCM = struct.pack('<HHLLHH', wave.WAVE_FORMAT_PCM, 1, 11025, 11025, 1, 8)
+
+    @staticmethod
+    def _wave_file(*chunks):
+        """Build in-memory WAVE bytes from (name, payload) chunks.
+
+        Each chunk stores its real payload length and is padded to an even
+        number of bytes, and the RIFF size is computed to match.
+        """
+        body = b'WAVE'
+        for name, payload in chunks:
+            body += name + struct.pack('<L', len(payload)) + payload
+            if len(payload) & 1:
+                body += b'\x00'
+        return b'RIFF' + struct.pack('<L', len(body)) + body
+
+    def test_read_unknown_extensible_subformat(self):
+        # A WAVE_FORMAT_EXTENSIBLE fmt chunk whose SubFormat GUID is not
+        # KSDATAFORMAT_SUBTYPE_PCM must be rejected.
+        fmt = struct.pack('<HHLLH', wave.WAVE_FORMAT_EXTENSIBLE, 2, 11025,
+                          11025 * 2 * 3, 6)
+        fmt += struct.pack('<H', 24)            # bits per sample
+        fmt += struct.pack('<HHL', 22, 24, 3)   # cbSize, valid bits, channel mask
+        fmt += b'\xff' * 16                      # bogus SubFormat GUID
+        b = self._wave_file((b'fmt ', fmt), (b'data', b''))
+        with self.assertRaisesRegex(wave.Error, 'unknown extended format'):
+            wave.open(io.BytesIO(b))
+
+    def test_read_truncated_fmt_chunk_header(self):
+        # fmt chunk too short for the fixed 14-byte header.
+        fmt = struct.pack('<H', wave.WAVE_FORMAT_PCM) + b'\x00' * 8
+        b = self._wave_file((b'fmt ', fmt))
+        with self.assertRaises(EOFError):
+            wave.open(io.BytesIO(b))
+
+    def test_read_truncated_fmt_chunk_sampwidth(self):
+        # fmt chunk holds the 14-byte header but is missing the sample width.
+        fmt = struct.pack('<HHLLH', wave.WAVE_FORMAT_PCM, 1, 11025, 11025, 1)
+        b = self._wave_file((b'fmt ', fmt))
+        with self.assertRaises(EOFError):
+            wave.open(io.BytesIO(b))
+
+    def test_read_skips_unknown_chunk(self):
+        # An unknown, odd-sized chunk between fmt and data must be skipped
+        # (including its pad byte) so the data chunk is still found.
+        data = b'\x01\x02\x03\x04'
+        b = self._wave_file((b'fmt ', self.FMT_PCM),
+                            (b'LIST', b'abc'),   # odd size, forces alignment
+                            (b'data', data))
+        with wave.open(io.BytesIO(b)) as r:
+            self.assertEqual(r.getnframes(), 4)
+            self.assertEqual(r.readframes(4), data)
+
+    def test_getfp_returns_underlying_file(self):
+        b = self._wave_file((b'fmt ', self.FMT_PCM), (b'data', b''))
+        with wave.open(io.BytesIO(b)) as r:
+            self.assertIsNotNone(r.getfp())
+
+    def test_open_invalid_mode(self):
+        with self.assertRaisesRegex(wave.Error, "mode must be"):
+            wave.open(io.BytesIO(), 'xb')
+
+    def test_open_path_closes_file_on_error(self):
+        # When opening by path fails to parse, the file we opened is closed
+        # and the parse error is propagated.
+        with tempfile.NamedTemporaryFile(delete=False) as fp:
+            fp.write(b'not a wave file')
+            filename = fp.name
+        self.addCleanup(unlink, filename)
+        with self.assertRaises(wave.Error):
+            wave.open(filename, 'rb')
+
+
+class WaveWriteValidationTest(unittest.TestCase):
+    """Cover parameter-validation paths of Wave_write."""
+
+    def open_writer(self):
+        w = wave.open(io.BytesIO(), 'wb')
+        self.addCleanup(self._close_quietly, w)
+        return w
+
+    @staticmethod
+    def _close_quietly(w):
+        # A writer whose required parameters are never set raises on close;
+        # swallow that so it does not mask the behaviour under test.
+        try:
+            w.close()
+        except wave.Error:
+            pass
+
+    def test_setnchannels_rejects_nonpositive(self):
+        w = self.open_writer()
+        with self.assertRaisesRegex(wave.Error, 'bad # of channels'):
+            w.setnchannels(0)
+
+    def test_getnchannels_not_set(self):
+        w = self.open_writer()
+        with self.assertRaisesRegex(wave.Error, 'number of channels not set'):
+            w.getnchannels()
+
+    def test_setsampwidth_rejects_out_of_range(self):
+        for width in (0, 5):
+            with self.subTest(width=width):
+                w = self.open_writer()
+                with self.assertRaisesRegex(wave.Error, 'bad sample width'):
+                    w.setsampwidth(width)
+
+    def test_getsampwidth_not_set(self):
+        w = self.open_writer()
+        with self.assertRaisesRegex(wave.Error, 'sample width not set'):
+            w.getsampwidth()
+
+    def test_getframerate_not_set(self):
+        w = self.open_writer()
+        with self.assertRaisesRegex(wave.Error, 'frame rate not set'):
+            w.getframerate()
+
+    def test_setcomptype_rejects_unknown(self):
+        w = self.open_writer()
+        with self.assertRaisesRegex(wave.Error, 'unsupported compression type'):
+            w.setcomptype('ADPCM', 'unsupported')
+
+    def test_setformat_rejects_unknown(self):
+        w = self.open_writer()
+        with self.assertRaisesRegex(wave.Error, 'unsupported wave format'):
+            w.setformat(0x1234)
+
+    def test_getparams_incomplete(self):
+        w = self.open_writer()
+        w.setnchannels(1)
+        with self.assertRaisesRegex(wave.Error, 'not all parameters set'):
+            w.getparams()
+
+    def test_tell_reports_frames_written(self):
+        w = self.open_writer()
+        w.setnchannels(1)
+        w.setsampwidth(2)
+        w.setframerate(44100)
+        self.assertEqual(w.tell(), 0)
+        w.writeframes(b'\x00\x00' * 5)
+        self.assertEqual(w.tell(), 5)
+
+    def test_cannot_change_params_after_write(self):
+        setters = (
+            ('setnchannels', (1,)),
+            ('setsampwidth', (2,)),
+            ('setframerate', (44100,)),
+            ('setnframes', (10,)),
+            ('setcomptype', ('NONE', 'not compressed')),
+            ('setformat', (wave.WAVE_FORMAT_PCM,)),
+            ('setparams', ((1, 2, 44100, 0, 'NONE', 'not compressed'),)),
+        )
+        for name, args in setters:
+            with self.subTest(setter=name):
+                w = self.open_writer()
+                w.setnchannels(1)
+                w.setsampwidth(2)
+                w.setframerate(44100)
+                w.writeframes(b'\x00\x00')
+                with self.assertRaisesRegex(wave.Error,
+                                            'cannot change parameters'):
+                    getattr(w, name)(*args)
+
+
 if __name__ == '__main__':
     unittest.main()

From 0b2843d269845058b82cf304853065b327b2e4bb Mon Sep 17 00:00:00 2001
From: Vyron Vasileiadis <hi@fedonman.com>
Date: Sun, 19 Jul 2026 02:32:06 +0300
Subject: [PATCH 2/7] Update Lib/test/test_wave.py

Co-authored-by: Victor Stinner <vstinner@python.org>
---
 Lib/test/test_wave.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Lib/test/test_wave.py b/Lib/test/test_wave.py
index fb04bdae528715..0c7078c7dc2310 100644
--- a/Lib/test/test_wave.py
+++ b/Lib/test/test_wave.py
@@ -531,10 +531,14 @@ def test_read_skips_unknown_chunk(self):
             self.assertEqual(r.getnframes(), 4)
             self.assertEqual(r.readframes(4), data)
 
-    def test_getfp_returns_underlying_file(self):
+    def test_getfp(self):
         b = self._wave_file((b'fmt ', self.FMT_PCM), (b'data', b''))
-        with wave.open(io.BytesIO(b)) as r:
-            self.assertIsNotNone(r.getfp())
+        fp = io.BytesIO(b)
+        with wave.open(fp) as r:
+            chunk = r.getfp()
+            self.assertIsNotNone(chunk)
+            self.assertIs(chunk.file, fp)
+            self.assertEqual(chunk.chunkname, b'RIFF')
 
     def test_open_invalid_mode(self):
         with self.assertRaisesRegex(wave.Error, "mode must be"):

From e2019ff770fa8216e514cbf4d68eda287a917bb6 Mon Sep 17 00:00:00 2001
From: Vyron Vasileiadis <hi@fedonman.com>
Date: Sun, 19 Jul 2026 02:36:17 +0300
Subject: [PATCH 3/7] changed tests based on comments by vstinner

---
 Lib/test/test_wave.py | 36 +++++++++++++-----------------------
 1 file changed, 13 insertions(+), 23 deletions(-)

diff --git a/Lib/test/test_wave.py b/Lib/test/test_wave.py
index 0c7078c7dc2310..9934c09272ca3b 100644
--- a/Lib/test/test_wave.py
+++ b/Lib/test/test_wave.py
@@ -172,6 +172,15 @@ def test__all__(self):
         not_exported = {'KSDATAFORMAT_SUBTYPE_PCM'}
         support.check__all__(self, wave, not_exported=not_exported)
 
+    def test_getfp(self):
+        b = self._wave_file((b'fmt ', self.FMT_PCM), (b'data', b''))
+        fp = io.BytesIO(b)
+        with wave.open(fp) as r:
+            chunk = r.getfp()
+            self.assertIsNotNone(chunk)
+            self.assertIs(chunk.file, fp)
+            self.assertEqual(chunk.chunkname, b'RIFF')
+
 
 class WaveLowLevelTest(unittest.TestCase):
 
@@ -473,6 +482,10 @@ def test_open_pathlike(self):
 
                     with wave.open(fake_path, 'rb') as f:
                         pass
+    
+    def test_open_invalid_mode(self):
+        with self.assertRaisesRegex(wave.Error, "mode must be"):
+            wave.open(io.BytesIO(), 'xb')
 
 
 class WaveReadErrorTest(unittest.TestCase):
@@ -531,29 +544,6 @@ def test_read_skips_unknown_chunk(self):
             self.assertEqual(r.getnframes(), 4)
             self.assertEqual(r.readframes(4), data)
 
-    def test_getfp(self):
-        b = self._wave_file((b'fmt ', self.FMT_PCM), (b'data', b''))
-        fp = io.BytesIO(b)
-        with wave.open(fp) as r:
-            chunk = r.getfp()
-            self.assertIsNotNone(chunk)
-            self.assertIs(chunk.file, fp)
-            self.assertEqual(chunk.chunkname, b'RIFF')
-
-    def test_open_invalid_mode(self):
-        with self.assertRaisesRegex(wave.Error, "mode must be"):
-            wave.open(io.BytesIO(), 'xb')
-
-    def test_open_path_closes_file_on_error(self):
-        # When opening by path fails to parse, the file we opened is closed
-        # and the parse error is propagated.
-        with tempfile.NamedTemporaryFile(delete=False) as fp:
-            fp.write(b'not a wave file')
-            filename = fp.name
-        self.addCleanup(unlink, filename)
-        with self.assertRaises(wave.Error):
-            wave.open(filename, 'rb')
-
 
 class WaveWriteValidationTest(unittest.TestCase):
     """Cover parameter-validation paths of Wave_write."""

From 28c5f9c2fcf6600075e13db6e78b6b67d7553c3d Mon Sep 17 00:00:00 2001
From: Vyron Vasileiadis <hi@fedonman.com>
Date: Sun, 19 Jul 2026 13:34:46 +0300
Subject: [PATCH 4/7] gh-153953: Fix test_getfp after moving it to MiscTestCase

The test relied on the _wave_file helper and FMT_PCM constant, which only
exist on WaveReadErrorTest. Build the WAVE file with the wave module so the
test is self-contained.
---
 Lib/test/test_wave.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Lib/test/test_wave.py b/Lib/test/test_wave.py
index 9934c09272ca3b..1efa8e3b485b4f 100644
--- a/Lib/test/test_wave.py
+++ b/Lib/test/test_wave.py
@@ -173,8 +173,12 @@ def test__all__(self):
         support.check__all__(self, wave, not_exported=not_exported)
 
     def test_getfp(self):
-        b = self._wave_file((b'fmt ', self.FMT_PCM), (b'data', b''))
-        fp = io.BytesIO(b)
+        fp = io.BytesIO()
+        with wave.open(fp, 'wb') as w:
+            w.setnchannels(1)
+            w.setsampwidth(1)
+            w.setframerate(11025)
+        fp.seek(0)
         with wave.open(fp) as r:
             chunk = r.getfp()
             self.assertIsNotNone(chunk)

From 2ce387f52caa7b00e798981e2cf011809115cc5a Mon Sep 17 00:00:00 2001
From: Vyron Vasileiadis <hi@fedonman.com>
Date: Sun, 19 Jul 2026 13:42:00 +0300
Subject: [PATCH 5/7] removes trailing whitespace

---
 Lib/test/test_wave.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lib/test/test_wave.py b/Lib/test/test_wave.py
index 1efa8e3b485b4f..0832e2a2db5d25 100644
--- a/Lib/test/test_wave.py
+++ b/Lib/test/test_wave.py
@@ -486,7 +486,7 @@ def test_open_pathlike(self):
 
                     with wave.open(fake_path, 'rb') as f:
                         pass
-    
+
     def test_open_invalid_mode(self):
         with self.assertRaisesRegex(wave.Error, "mode must be"):
             wave.open(io.BytesIO(), 'xb')

From 83a14bbb977830c0e2174f3c4934c3691dd4a914 Mon Sep 17 00:00:00 2001
From: Vyron Vasileiadis <hi@fedonman.com>
Date: Sun, 26 Jul 2026 18:12:35 +0300
Subject: [PATCH 6/7] apply reviewer's comments

---
 Lib/test/test_wave.py | 54 ++++++++++++++++++++++++++-----------------
 1 file changed, 33 insertions(+), 21 deletions(-)

diff --git a/Lib/test/test_wave.py b/Lib/test/test_wave.py
index 0832e2a2db5d25..784c56e490565b 100644
--- a/Lib/test/test_wave.py
+++ b/Lib/test/test_wave.py
@@ -552,20 +552,24 @@ def test_read_skips_unknown_chunk(self):
 class WaveWriteValidationTest(unittest.TestCase):
     """Cover parameter-validation paths of Wave_write."""
 
-    def open_writer(self):
-        w = wave.open(io.BytesIO(), 'wb')
-        self.addCleanup(self._close_quietly, w)
+    @staticmethod  
+    def _close(w):  
+        try:  
+            # Make sure that all parameters are set  
+            w.setnchannels(1)  
+            w.setsampwidth(2)  
+            w.setframerate(44100)  
+        except wave.Error:  
+            # Ignore "cannot change parameters after starting to write" error  
+            pass  
+
+        w.close()  
+
+    def open_writer(self):  
+        w = wave.open(io.BytesIO(), 'wb')  
+        self.addCleanup(self._close, w)  
         return w
 
-    @staticmethod
-    def _close_quietly(w):
-        # A writer whose required parameters are never set raises on close;
-        # swallow that so it does not mask the behaviour under test.
-        try:
-            w.close()
-        except wave.Error:
-            pass
-
     def test_setnchannels_rejects_nonpositive(self):
         w = self.open_writer()
         with self.assertRaisesRegex(wave.Error, 'bad # of channels'):
@@ -609,14 +613,23 @@ def test_getparams_incomplete(self):
         with self.assertRaisesRegex(wave.Error, 'not all parameters set'):
             w.getparams()
 
-    def test_tell_reports_frames_written(self):
-        w = self.open_writer()
-        w.setnchannels(1)
-        w.setsampwidth(2)
-        w.setframerate(44100)
-        self.assertEqual(w.tell(), 0)
-        w.writeframes(b'\x00\x00' * 5)
-        self.assertEqual(w.tell(), 5)
+    def test_tell(self):  
+        def check_nframes(nframes):  
+            self.assertEqual(w.tell(), nframes)  
+            self.assertEqual(w.getnframes(), nframes)  
+
+        w = self.open_writer()  
+        w.setnchannels(1)  
+        w.setsampwidth(2)  
+        w.setframerate(44100)  
+        check_nframes(0)  
+
+        frame = b'\x00\x00'  
+        w.writeframes(frame * 5)  
+        check_nframes(5)  
+
+        w.writeframes(frame * 3)  
+        check_nframes(8)  
 
     def test_cannot_change_params_after_write(self):
         setters = (
@@ -639,6 +652,5 @@ def test_cannot_change_params_after_write(self):
                                             'cannot change parameters'):
                     getattr(w, name)(*args)
 
-
 if __name__ == '__main__':
     unittest.main()

From f55830c29e7081200aba06d3867c0d7660ddf0a2 Mon Sep 17 00:00:00 2001
From: Vyron Vasileiadis <hi@fedonman.com>
Date: Sun, 26 Jul 2026 18:13:35 +0300
Subject: [PATCH 7/7] Update Lib/test/test_wave.py

Co-authored-by: Victor Stinner <vstinner@python.org>
---
 Lib/test/test_wave.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Lib/test/test_wave.py b/Lib/test/test_wave.py
index 784c56e490565b..ee7b094005f575 100644
--- a/Lib/test/test_wave.py
+++ b/Lib/test/test_wave.py
@@ -632,6 +632,12 @@ def check_nframes(nframes):
         check_nframes(8)  
 
     def test_cannot_change_params_after_write(self):
+        w = self.open_writer()
+        w.setnchannels(1)
+        w.setsampwidth(2)
+        w.setframerate(44100)
+        w.writeframes(b'\x00\x00')
+
         setters = (
             ('setnchannels', (1,)),
             ('setsampwidth', (2,)),
@@ -643,11 +649,6 @@ def test_cannot_change_params_after_write(self):
         )
         for name, args in setters:
             with self.subTest(setter=name):
-                w = self.open_writer()
-                w.setnchannels(1)
-                w.setsampwidth(2)
-                w.setframerate(44100)
-                w.writeframes(b'\x00\x00')
                 with self.assertRaisesRegex(wave.Error,
                                             'cannot change parameters'):
                     getattr(w, name)(*args)