From 2612dab1f4517db11f9762ac2c1dc6df13883bf9 Mon Sep 17 00:00:00 2001 From: Christian Herdtweck Date: Tue, 19 Jul 2016 13:05:19 +0200 Subject: [PATCH] remove closing_new_volume_handler since tarfile does the closing now on its own --- testing/__init__.py | 8 -------- testing/test_multivol.py | 4 ++-- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/testing/__init__.py b/testing/__init__.py index ebaf6c8..24ea816 100644 --- a/testing/__init__.py +++ b/testing/__init__.py @@ -39,14 +39,6 @@ def make_new_encryption_volume_handler(encryption): new_volume_handler (tarobj, base_name, volume_number, encryption=encryption) -def closing_new_volume_handler(tarobj, base_name, volume_number): - ''' - Handles the new volumes - ''' - volume_path = "%s.%d" % (base_name, volume_number) - tarobj.fileobj.close() - tarobj.open_volume(volume_path) - class BaseTest(unittest.TestCase): """ Test concatenated compression in tarfiles diff --git a/testing/test_multivol.py b/testing/test_multivol.py index 5ee71f9..8a1f7b3 100644 --- a/testing/test_multivol.py +++ b/testing/test_multivol.py @@ -20,7 +20,7 @@ from tempfile import TemporaryDirectory import deltatar.crypto as crypto from deltatar.tarfile import TarFile, PAX_FORMAT, GNU_FORMAT, BLOCKSIZE -from . import BaseTest, new_volume_handler, closing_new_volume_handler +from . import BaseTest, new_volume_handler from .create_pseudo_random_files import create_file as create_random_file from .test_multivol_compression_sizes import test as multivol_compr_test_func @@ -720,7 +720,7 @@ class MultivolGnuFormatTest(BaseTest): mode="w", format=self.tarfile_format, max_volume_size=2*1024*1024, - new_volume_handler=closing_new_volume_handler) + new_volume_handler=new_volume_handler) tarobj.add("big") tarobj.close() -- 1.7.1