Incorporate reviewer suggestions

Author: Shrey-N

Lib/test/test_pdb.py

@@ -4765,7 +4765,26 @@ def foo(self):
         """
         stdout, stderr = self.run_pdb_script(script, commands)
         self.assertIn("The specified object 'C.foo' is not a function", stdout)
-
+    def test_end_of_options_separator(self):
+        # gh-148615: Test parsing when '--' separator is used
+        script = "import sys; print(f'ARGS: {sys.argv[1:]}')"
+        with open(os_helper.TESTFN, 'w', encoding='utf-8') as f:
+            f.write(script)
+        stdout, _ = self._run_pdb(['--', os_helper.TESTFN, '-foo'], 'c\nq')
+        self.assertIn("ARGS: ['-foo']", stdout)
+        stdout, _ = self._run_pdb(['-c', 'continue', '--', os_helper.TESTFN, '-c', 'foo'], 'q')
+        self.assertIn("ARGS: ['-c', 'foo']", stdout)
+        stdout, stderr = self._run_pdb(['--'], 'q', expected_returncode=2)
+        self.assertIn("missing script or module to run", stderr)
+        stdout, stderr = self._run_pdb(['-x', '--', os_helper.TESTFN], 'q', expected_returncode=2)
+        self.assertIn("unrecognized arguments: -x", stderr)
+        stdout, _ = self._run_pdb([os_helper.TESTFN, '--', 'arg'], 'c\nq')
+        self.assertIn("ARGS: ['--', 'arg']", stdout)
+        with os_helper.temp_cwd():
+            with open('mymod.py', 'w', encoding='utf-8') as f:
+                f.write(script)
+            stdout, _ = self._run_pdb(['-m', 'mymod', '--', 'arg'], 'c\nq')
+            self.assertIn("ARGS: ['--', 'arg']", stdout)
 
 class ChecklineTests(unittest.TestCase):
     def setUp(self):
@@ -5210,34 +5229,6 @@ def test_interact_completion(self):
         self.assertIn(b'84', output)
 
 
-class PdbCommandLineTestCase(unittest.TestCase):
-    def test_end_of_options_separator(self):
-        # gh-148615: Test parsing when '--' separator is used
-        from pdb import parse_args
-        with patch('sys.argv', ['pdb.py', '--', 'my_script.py', '-foo']):
-            opts, args = parse_args()
-            self.assertEqual(args, ['my_script.py', '-foo'])
-        with patch('sys.argv', ['pdb.py', '-c', 'continue', '--', 'my_script.py', '-c', 'foo']):
-            opts, args = parse_args()
-            self.assertEqual(opts.commands, ['continue'])
-            self.assertEqual(args, ['my_script.py', '-c', 'foo'])
-        with patch('sys.argv', ['pdb.py', '--']):
-            with support.captured_stderr() as stderr:
-                with self.assertRaises(SystemExit):
-                    parse_args()
-            self.assertIn("missing script or module to run", stderr.getvalue())
-        with patch('sys.argv', ['pdb.py', '-x', '--', 'my_script.py']):
-            with support.captured_stderr() as stderr:
-                with self.assertRaises(SystemExit):
-                    parse_args()
-            self.assertIn("unrecognized arguments: -x", stderr.getvalue())
-        with patch('sys.argv', ['pdb.py', 'foo', '--', 'my_script.py']):
-            opts, args = parse_args()
-            self.assertEqual(args, ['foo', '--', 'my_script.py'])
-        with patch('sys.argv', ['pdb.py', '-m', 'my_module', '--', 'foo']):
-            opts, args = parse_args()
-            self.assertEqual(opts.module, 'my_module')
-            self.assertEqual(args, ['--', 'foo'])
 
 def load_tests(loader, tests, pattern):
     from test import test_pdb