gh-143668: Add format-independent tests for make_archive path-like support

Author: tadejmagajna

Lib/shutil.py

@@ -1216,6 +1216,8 @@ def make_archive(base_name, format, root_dir=None, base_dir=None, verbose=0,
 
     if base_dir is None:
         base_dir = os.curdir
+    else:
+        base_dir = os.fspath(base_dir)
 
     supports_root_dir = getattr(func, 'supports_root_dir', False)
     save_cwd = None

Lib/test/test_shutil.py

@@ -2042,23 +2042,31 @@ def test_make_zipfile_in_curdir(self):
             self.assertEqual(make_archive('test', 'zip'), 'test.zip')
             self.assertTrue(os.path.isfile('test.zip'))
 
-    @support.requires_zlib()
-    def test_make_archive_accepts_pathlike(self):
-        tmpdir = self.mkdtemp()
-        with os_helper.change_cwd(tmpdir), no_chdir:
-            # Test path-like base_name without root_dir and base_dir
-            base_name = FakePath(os.path.join(tmpdir, 'archive'))
-            res = make_archive(base_name, 'zip')
-            self.assertEqual(res, os.path.join(tmpdir, 'archive.zip'))
-            self.assertTrue(os.path.isfile(res))
-
-            # Test with path-like base_name, root_dir, and base_dir
-            root_dir, base_dir = self._create_files()
-            base_name = FakePath(os.path.join(tmpdir, 'archive2'))
-            res = make_archive(
-                base_name, 'zip', FakePath(root_dir), FakePath(base_dir))
-            self.assertEqual(res, os.path.join(tmpdir, 'archive2.zip'))
-            self.assertTrue(os.path.isfile(res))
+    def test_make_archive_pathlike_cwd_default(self):
+        called_args = []
+        def archiver(base_name, base_dir, **kw):
+            called_args.append((base_name, kw.get('root_dir')))
+
+        register_archive_format('xxx', archiver, [], 'xxx file')
+        self.addCleanup(unregister_archive_format, 'xxx')
+        with no_chdir:
+            make_archive(FakePath('basename'), 'xxx')
+        self.assertEqual(called_args, [('basename', None)])
+
+    def test_make_archive_pathlike_cwd_supports_root_dir(self):
+        root_dir = self.mkdtemp()
+        called_args = []
+        def archiver(base_name, base_dir, **kw):
+            called_args.append((base_name, base_dir, kw.get('root_dir')))
+        archiver.supports_root_dir = True
+
+        register_archive_format('xxx', archiver, [], 'xxx file')
+        self.addCleanup(unregister_archive_format, 'xxx')
+        with no_chdir:
+            make_archive(FakePath('basename'), 'xxx',
+                         root_dir=FakePath(root_dir),
+                         base_dir=FakePath('basedir'))
+        self.assertEqual(called_args, [('basename', 'basedir', root_dir)])
 
     def test_register_archive_format(self):