Add in ActiveTests so its easier to test in future

Author: rickprice

Lib/tarfile.py

@@ -928,10 +928,10 @@ def __exit__(self, type, value, traceback):
         else:
             # An exception occurred. We must not call close() because
             # it would try to write end-of-archive blocks and padding.
-            #INFO: This was used in Python3.6, but we aren't based off io.BufferedReader in Python2
-            # if not self._extfileobj:
-            #     self.fileobj.close()
-            self.close()
+            if not self._extfileobj:
+                self.fileobj.close()
+
+
 #class ExFileObject
 
 #------------------
@@ -1962,14 +1962,16 @@ def gettarinfo(self, name=None, arcname=None, fileobj=None):
                 tarinfo.devminor = os.minor(statres.st_rdev)
         return tarinfo
 
-    def list(self, verbose=True):
+    def list(self, verbose=True, members=None):
         """Print a table of contents to sys.stdout. If `verbose' is False, only
            the names of the members are printed. If it is True, an `ls -l'-like
            output is produced.
         """
         self._check()
 
-        for tarinfo in self:
+        if members is None:
+            members = self.getmembers()
+        for tarinfo in members:
             if verbose:
                 print filemode(tarinfo.mode),
                 print "%s/%s" % (tarinfo.uname or tarinfo.uid,

Lib/test/test_tarfile.py

@@ -80,7 +80,6 @@ def test_fileobj_readlines(self):
                 "I will gladly admit that Python is not the fastest running scripting language.\n",
                 "fileobj.readlines() failed")
 
-        #FIX: This now breaks with the new tarfile
     def test_fileobj_iter(self):
         self.tar.extract("ustar/regtype", TEMPDIR)
         tarinfo = self.tar.getmember("ustar/regtype")
@@ -238,18 +237,17 @@ def test_list_verbose(self):
         self.assertIn('pax' + ('/123' * 125) + '/longlink link to pax' +
                       ('/123' * 125) + '/longname', out)
 
-    #INFO: Python2 list doesn't have the "members" functionality, so can't test
-    # def test_list_members(self):
-    #     tio = io.TextIOWrapper(io.BytesIO(), 'ascii', newline='\n')
-    #     def members(tar):
-    #         for tarinfo in tar.getmembers():
-    #             if 'reg' in tarinfo.name:
-    #                 yield tarinfo
-    #     with support.swap_attr(sys, 'stdout', tio):
-    #         self.tar.list(verbose=False, members=members(self.tar))
-    #     out = tio.detach().getvalue()
-    #     self.assertIn(b'ustar/regtype', out)
-    #     self.assertNotIn(b'ustar/conttype', out)
+    def test_list_members(self):
+        tio = io.BufferedRandom(io.BytesIO())
+        def members(tar):
+            for tarinfo in tar.getmembers():
+                if 'reg' in tarinfo.name:
+                    yield tarinfo
+        with support.swap_attr(sys, 'stdout', tio):
+            self.tar.list(verbose=False, members=members(self.tar))
+        out = tio.detach().getvalue()
+        self.assertIn(b'ustar/regtype', out)
+        self.assertNotIn(b'ustar/conttype', out)
 
 class GzipListTest(ListTest):
     tarname = gzipname
@@ -577,9 +575,6 @@ def test_parallel_iteration(self):
                 self.assertEqual(m1.offset, m2.offset)
                 self.assertEqual(m1.name, m2.name)
 
-# FIX: Brought in from Python3.6
-# class MiscReadTest(MiscReadTestBase, unittest.TestCase):
-#     test_fail_comp = None
 
 class StreamReadTest(CommonReadTest):
 
@@ -622,13 +617,6 @@ def test_compare_members(self):
         finally:
             tar1.close()
 
-# FIX: Brought in from Python3.6
-# class GzipStreamReadTest(GzipTest, StreamReadTest):
-#     pass
-#
-#INFO: Python2 doesn't have LZMA
-# class LzmaStreamReadTest(LzmaTest, StreamReadTest):
-#     pass
 
 class TarTest:
     tarname = tarname
@@ -640,6 +628,7 @@ class TarTest:
     def mode(self):
         return self.prefix + self.suffix
 
+
 class DetectReadTest(TarTest, unittest.TestCase):
     def _testfunc_file(self, name, mode):
         try:
@@ -710,10 +699,6 @@ def test_detect_stream_bz2(self):
         self._testfunc_file(tmpname, "r|*")
 
 
-#INFO: Python2 doesn't have LZMA
-# class LzmaDetectReadTest(LzmaTest, DetectReadTest):
-#     pass
-
 class MemberReadTest(ReadTest):
 
     def _test_member(self, tarinfo, chksum=None, **kwargs):
@@ -916,6 +901,7 @@ def test_eof_marker(self):
             t.size = tarfile.RECORDSIZE - tarfile.BLOCKSIZE
             tar.addfile(t, io.BytesIO(b"a" * t.size))
 
+
 class WriteTest(WriteTestBase):
 
     mode = "w:"
@@ -984,6 +970,7 @@ def test_directory_size(self):
         finally:
             os.rmdir(path)
 
+
     #INFO: We don't have pathlib on Python2, not sure if we can really test this
     # def test_gettarinfo_pathlike_name(self):
     #     with tarfile.open(tmpname, self.mode) as tar:
@@ -996,8 +983,7 @@ def test_directory_size(self):
     #         self.assertEqual(tarinfo.name, tarinfo2.name)
     #         self.assertEqual(tarinfo.size, 3)
 
-    @unittest.skipUnless(hasattr(os, "link"),
-                         "Missing hardlink implementation")
+    @unittest.skipUnless(hasattr(os, "link"),"Missing hardlink implementation")
     def test_link_size(self):
         if hasattr(os, "link"):
             link = os.path.join(TEMPDIR, "link")
@@ -1546,21 +1532,6 @@ def test_create_taropen_pathlike_name(self):
         self.assertIn('spameggs42', names[0])
 
 
-#FIX: Brought in by Python3.6
-# class GzipCreateTest(GzipTest, CreateTest):
-#     pass
-
-
-#FIX: Brought in by Python3.6
-# class Bz2CreateTest(Bz2Test, CreateTest):
-#     pass
-
-
-#INFO: Python2 doesn't have LZMA
-# class LzmaCreateTest(LzmaTest, CreateTest):
-#     pass
-
-
 class CreateWithXModeTest(CreateTest):
 
     prefix = "x"
@@ -1813,12 +1784,29 @@ def test_error_handler_utf8(self):
         self.assertEqual(tar.getnames()[0], "\xe4\xf6\xfc/" + u"\u20ac".encode("utf8"))
 
     # FIX: Came in on Python3.6
-    # # Test the same as above for the 100 bytes link field.
-    # def test_unicode_link1(self):
-    #     self._test_ustar_link("0123456789" * 10)
-    #     self._test_ustar_link("0123456789" * 10 + "0", ValueError)
-    #     self._test_ustar_link("0123456789" * 9 + "01234567\xff")
-    #     self._test_ustar_link("0123456789" * 9 + "012345678\xff", ValueError)
+    # Test the same as above for the 100 bytes link field.
+    def test_unicode_link1(self):
+        self._test_ustar_link("0123456789" * 10)
+        self._test_ustar_link("0123456789" * 10 + "0", ValueError)
+        # Use a two byte UTF-8 character
+        self._test_ustar_link("0123456789" * 9 + "01234567\303\251")
+        self._test_ustar_link("0123456789" * 9 + "012345678\303\251", ValueError)
+
+    def _test_ustar_link(self, name, exc=None):
+        with tarfile.open(tmpname, "w", format=0, encoding="utf-8") as tar:
+            t = tarfile.TarInfo("foo")
+            t.linkname = name
+            if exc is None:
+                tar.addfile(t)
+            else:
+                self.assertRaises(exc, tar.addfile, t)
+
+        if exc is None:
+            with tarfile.open(tmpname, "r", encoding="utf-8") as tar:
+                for t in tar:
+                    self.assertEqual(name, t.linkname)
+                    break
+
 
 class AppendTest(unittest.TestCase):
     # Test append mode (cp. patch #1652681).
@@ -1979,7 +1967,7 @@ def test_char_fields(self):
                           "foo")
         self.assertEqual(tarfile.nts(b"foo\0bar\0"),
                           "foo")
-    
+
     def test_read_number_fields(self):
         # Issue 13158: Test if GNU tar specific base-256 number fields
         # are decoded correctly.
@@ -1989,12 +1977,6 @@ def test_read_number_fields(self):
                        0o10000000)
         self.assertEqual(tarfile.nti(b"\x80\x00\x00\x00\xff\xff\xff\xff"),
                        0xffffffff)
-        # self.assertEqual(tarfile.nti(b"\xff\xff\xff\xff\xff\xff\xff\xff"),
-        #                -1)
-        # self.assertEqual(tarfile.nti(b"\xff\xff\xff\xff\xff\xff\xff\x9c"),
-        #                -100)
-        # self.assertEqual(tarfile.nti(b"\xff\x00\x00\x00\x00\x00\x00\x00"),
-        #                -0x100000000000000)
 
         # Issue 24514: Test if empty number fields are converted to zero.
         self.assertEqual(tarfile.nti("\0"), 0)

Makefile.pre.in

@@ -873,6 +873,16 @@ testall:	@DEF_MAKE_RULE@ platform
 		-$(TESTPYTHON) $(TESTPROG) -uall $(TESTOPTS)
 		$(TESTPYTHON) $(TESTPROG) -uall $(TESTOPTS)
 
+
+TESTOPTSA=	$(TESTOPTS) -vvv
+TESTPROGA=	$(srcdir)/Lib/test/test_shutil.py
+TESTPYTHONA=	$(RUNSHARED) ./$(BUILDPYTHON) -Wd -3 -E -tt $(TESTPYTHONOPTS)
+testA:	
+		-find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
+		-$(TESTPYTHONA) $(TESTPROGA) $(TESTOPTSA)
+		$(TESTPYTHONA) $(TESTPROGA) $(TESTOPTSA)
+
+
 #  Run the unitests for both architectures in a Universal build on OSX
 #  Must be run on an Intel box.
 testuniversal:	@DEF_MAKE_RULE@ platform