From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 6 Sep 2015 15:33:52 +0000 (+0300)
Subject: Fix, refactor and extend tests for shutil.make_archive().
X-Git-Tag: v3.6.0a1~1658^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2ba39800e53140a3df6aed92ccbd1f99b9f83290;p=python

Fix, refactor and extend tests for shutil.make_archive().
---

2ba39800e53140a3df6aed92ccbd1f99b9f83290
diff --cc Lib/test/test_shutil.py
index b1e4aa161e,8fc4562161..1c14b5cf44
--- a/Lib/test/test_shutil.py
+++ b/Lib/test/test_shutil.py
@@@ -1185,13 -1171,14 +1177,16 @@@ class TestShutil(unittest.TestCase)
          formats = ['tar', 'gztar', 'zip']
          if BZ2_SUPPORTED:
              formats.append('bztar')
 +        if LZMA_SUPPORTED:
 +            formats.append('xztar')
  
+         root_dir, base_dir = self._create_files()
          for format in formats:
-             tmpdir = self.mkdtemp()
-             base_dir, root_dir, base_name =  self._create_files()
-             tmpdir2 = self.mkdtemp()
+             expected = rlistdir(root_dir)
+             expected.remove('outer')
+             if format == 'zip':
+                 expected.remove('dist/sub2/')
+             base_name = os.path.join(self.mkdtemp(), 'archive')
              filename = make_archive(base_name, format, root_dir, base_dir)
  
              # let's try to unpack it now