From: Philipp Gesang <philipp.gesang@intra2net.com>
Date: Thu, 30 Jan 2020 09:41:31 +0000 (+0100)
Subject: guard invocations of tar from interactive mode
X-Git-Tag: v2.2~7^2~3
X-Git-Url: http://developer.intra2net.com/git/?p=python-delta-tar;a=commitdiff_plain;h=5cf23eabd8eee9e4f0cb6fb535c99b4634c422fe

guard invocations of tar from interactive mode

On failure, tests may cause GNU tar to prompt for user input like
for example volume names etc. which may interrupt the test run.
Prevent that by passing /dev/null wherever we shell out to tar.
---

diff --git a/deltatar/tarfile.py b/deltatar/tarfile.py
index edfe584..b4b784a 100644
--- a/deltatar/tarfile.py
+++ b/deltatar/tarfile.py
@@ -2787,6 +2787,7 @@ class TarFile(object):
             self._extfileobj = True
             self._dbg(3, 'open_volume: using external fileobj {}', fileobj)
         self.name = os.path.abspath(name) if name else None
+        self.fileobj.close()
         self.fileobj = fileobj
 
         # init data structures
diff --git a/testing/__init__.py b/testing/__init__.py
index 8f3bbbe..ebaf6c8 100644
--- a/testing/__init__.py
+++ b/testing/__init__.py
@@ -29,7 +29,6 @@ def new_volume_handler(tarobj, base_name, volume_number, encryption=None):
     Handles the new volumes
     '''
     volume_path = "%s.%d" % (base_name, volume_number)
-    tarobj.close()
     tarobj.open_volume(volume_path, encryption=encryption)
 
 def make_new_encryption_volume_handler(encryption):
diff --git a/testing/test_encryption.py b/testing/test_encryption.py
index 26e62e0..fee7b41 100644
--- a/testing/test_encryption.py
+++ b/testing/test_encryption.py
@@ -81,7 +81,7 @@ class EncryptionTest(BaseTest):
 
         # extract with normal tar and check output
         os.system("zcat sample.tar.gz 2>/dev/null > sample.tar")
-        os.system("tar xf sample.tar")
+        os.system("tar xf sample.tar </dev/null")
         assert os.path.exists("big")
         assert hash == self.md5sum("big")
 
@@ -121,7 +121,7 @@ class EncryptionTest(BaseTest):
 
         # extract with normal tar and check output
         os.system("zcat sample.tar.gz 2>/dev/null > sample.tar")
-        os.system("tar xf sample.tar")
+        os.system("tar xf sample.tar </dev/null")
         assert os.path.exists("big")
         assert hash == self.md5sum("big")
 
@@ -161,7 +161,7 @@ class EncryptionTest(BaseTest):
 
         # extract with normal tar and check output
         os.system("zcat sample.tar.gz 2>/dev/null > sample.tar")
-        os.system("tar xf sample.tar")
+        os.system("tar xf sample.tar </dev/null")
         assert os.path.exists("big")
         assert hash == self.md5sum("big")
 
@@ -249,7 +249,7 @@ class EncryptionTest(BaseTest):
             fname = "pdtcrypt-object-%d.bin" % (i + 1)
             assert os.path.exists(fname)
             os.system("zcat '%s' 2>/dev/null > sample.tar" % fname)
-            os.system("tar xf sample.tar")
+            os.system("tar xf sample.tar </dev/null")
 
         for fname, digest in hash.items():
             assert os.path.exists(fname)
@@ -298,7 +298,7 @@ class EncryptionTest(BaseTest):
             fname = "pdtcrypt-object-%d.bin" % (i + 1)
             assert os.path.exists(fname)
             os.system("zcat '%s' 2>/dev/null > sample.tar" % fname)
-            os.system("tar xf sample.tar")
+            os.system("tar xf sample.tar </dev/null")
 
         for fname, digest in hash.items():
             assert os.path.exists(fname)
diff --git a/testing/test_multivol.py b/testing/test_multivol.py
index 1f8cecb..580ec97 100644
--- a/testing/test_multivol.py
+++ b/testing/test_multivol.py
@@ -69,7 +69,7 @@ class MultivolGnuFormatTest(BaseTest):
         assert not os.path.exists("big")
 
         # extract and check
-        os.system("tar xfM sample.tar")
+        os.system("tar xfM sample.tar </dev/null")
         assert os.path.exists("big")
         assert hash == self.md5sum("big")
 
@@ -99,7 +99,7 @@ class MultivolGnuFormatTest(BaseTest):
         assert not os.path.exists("big")
 
         # extract with normal tar and check output
-        os.system("tar xfM sample.tar --file=sample.tar.1")
+        os.system("tar xfM sample.tar --file=sample.tar.1 </dev/null")
         assert os.path.exists("big")
         assert hash == self.md5sum("big")
 
@@ -130,7 +130,7 @@ class MultivolGnuFormatTest(BaseTest):
         assert not os.path.exists("big")
 
         # extract with normal tar and check output
-        os.system("tar xfM sample.tar --file=sample.tar.1 --file=sample.tar.2")
+        os.system("tar xfM sample.tar --file=sample.tar.1 --file=sample.tar.2 </dev/null")
         assert os.path.exists("big")
         assert hash == self.md5sum("big")
 
@@ -167,7 +167,7 @@ class MultivolGnuFormatTest(BaseTest):
         os.unlink("small2")
 
         # extract with normal tar and check output
-        os.system("tar xfM sample.tar --file=sample.tar.1 --file=sample.tar.2")
+        os.system("tar xfM sample.tar --file=sample.tar.1 --file=sample.tar.2 </dev/null")
         for key, value in hash.items():
             assert os.path.exists(key)
             assert value == self.md5sum(key)
@@ -388,7 +388,7 @@ class MultivolGnuFormatTest(BaseTest):
 
         # create the tar file with volumes
         os.system("tar cM --format=%s -L 3000 big --file=sample.tar "\
-            "--file=sample.tar.1" % self.tar_command_format)
+            "--file=sample.tar.1 </dev/null" % self.tar_command_format)
 
         # check that the tar volumes were correctly created
         assert os.path.exists("sample.tar")
@@ -420,7 +420,7 @@ class MultivolGnuFormatTest(BaseTest):
 
         # create the tar file with volumes
         os.system("tar cM --format=%s -L 3000 big small small2 --file=sample.tar "\
-            "--file=sample.tar.1" % self.tar_command_format)
+            "--file=sample.tar.1 </dev/null" % self.tar_command_format)
 
         # check that the tar volumes were correctly created
         assert os.path.exists("sample.tar")