Add basic unit tests for --file-from and --file-from0

Test the basic functionality of "attic create" with --files-from and
--files-from0 options. Note that the tests are not very exhaustive;
missing in particular is:

- reading from stdin, as the test harness doesn't emulate
  sys.stdin.buffer.
- use of multiple --files-from and/or --files-from0 options.

Author: rotty

attic/archiver.py

@@ -118,6 +118,8 @@ def do_create(self, args):
                 pass
         for f in args.filelists:
             self._process_filelist(archive, cache, skip_inodes, f)
+            if not (f is sys.stdin or f is getattr(sys.stdin, 'buffer', None)):
+                f.close()
         for path in args.paths:
             path = os.path.normpath(path)
             if args.dontcross:

attic/testsuite/archiver.py

@@ -9,6 +9,7 @@
 import tempfile
 import time
 import unittest
+import itertools
 from hashlib import sha256
 from attic import xattr
 from attic.archive import Archive, ChunkBuffer
@@ -59,6 +60,9 @@ def __exit__(self, *args, **kw):
             if v is not None:
                 os.environ[k] = v
 
+def listdir_recursive(dirname):
+    return itertools.chain(*[[os.path.normpath(os.path.join(dirpath, f)) for f in filenames]
+                             for dirpath, dirnames, filenames in os.walk(dirname)])
 
 class ArchiverTestCaseBase(AtticTestCase):
 
@@ -262,6 +266,27 @@ def test_exclude_caches(self):
         self.assert_equal(sorted(os.listdir('output/input')), ['cache2', 'file1'])
         self.assert_equal(sorted(os.listdir('output/input/cache2')), ['CACHEDIR.TAG'])
 
+    def test_files_from(self):
+        self._test_files_from_option(delim=b'\n', option='--files-from')
+
+    def test_files_from0(self):
+        self._test_files_from_option(delim=b'\0', option='--files-from0')
+
+    def _test_files_from_option(self, *, delim, option):
+        self.attic('init', self.repository_location)
+        for filename in ['file1', 'non-listed/file', 'listed/file']:
+            self.create_regular_file(filename, size=1024 * 80)
+        listed_files = sorted(['file1', 'listed/file'])
+        self.create_regular_file('filelist',
+                                 contents=delim.join([os.path.join('input', f).encode('ascii')
+                                                      for f in listed_files]))
+        self.attic('create', option + '=input/filelist', self.repository_location + '::test')
+        with changedir('output'):
+            self.attic('extract', self.repository_location + '::test')
+        with changedir('output/input'):
+            present_files = sorted(listdir_recursive('.'))
+        self.assert_equal(present_files, listed_files)
+
     def test_path_normalization(self):
         self.attic('init', self.repository_location)
         self.create_regular_file('dir1/dir2/file', size=1024 * 80)