From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 24 Nov 2013 00:30:59 +0000 (+0200)
Subject: Build a list of supported test tarfiles dynamically for CLI "test" command
X-Git-Tag: v3.4.0b1~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5e8c8091ee635e9493f2e308f3681fb44b0e64ac;p=thirdparty%2FPython%2Fcpython.git

Build a list of supported test tarfiles dynamically for CLI "test" command
tests (issue13477).
---

diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py
index 886a80e22756..69e77f6de02b 100644
--- a/Lib/test/test_tarfile.py
+++ b/Lib/test/test_tarfile.py
@@ -1745,13 +1745,13 @@ class CommandLineTest(unittest.TestCase):
                 tf.add(tardata, arcname=os.path.basename(tardata))
 
     def test_test_command(self):
-        for tar_name in (tarname, gzipname, bz2name, xzname):
+        for tar_name in testtarnames:
             for opt in '-t', '--test':
                 out = self.tarfilecmd(opt, tar_name)
                 self.assertEqual(out, b'')
 
     def test_test_command_verbose(self):
-        for tar_name in (tarname, gzipname, bz2name, xzname):
+        for tar_name in testtarnames:
             for opt in '-v', '--verbose':
                 out = self.tarfilecmd(opt, '-t', tar_name)
                 self.assertIn(b'is a tar archive.\n', out)
@@ -1763,7 +1763,7 @@ class CommandLineTest(unittest.TestCase):
         self.assertEqual(out, b'')
         self.assertEqual(rc, 1)
 
-        for tar_name in (tarname, gzipname, bz2name, xzname):
+        for tar_name in testtarnames:
             with self.subTest(tar_name=tar_name):
                 with open(tar_name, 'rb') as f:
                     data = f.read()
@@ -2015,6 +2015,8 @@ def setUpModule():
     support.unlink(TEMPDIR)
     os.makedirs(TEMPDIR)
 
+    global testtarnames
+    testtarnames = [tarname]
     with open(tarname, "rb") as fobj:
         data = fobj.read()
 
@@ -2022,6 +2024,7 @@ def setUpModule():
     for c in GzipTest, Bz2Test, LzmaTest:
         if c.open:
             support.unlink(c.tarname)
+            testtarnames.append(c.tarname)
             with c.open(c.tarname, "wb") as tar:
                 tar.write(data)