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

diff --cc Lib/test/test_shutil.py
index b1e4aa161ea525e84149d5a48c719e95acd55771,8fc45621615fd0e31300b445a3561e34212472c5..1c14b5cf4478be1aaff0b3f338d5c2e25c491c0d
--- 1/Lib/test/test_shutil.py
--- 2/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