Merge lp:~aaron-whitehouse/duplicity/progress_option_error into lp:~duplicity-team/duplicity/0.7-series

[Aaron Whitehouse]

Added test_exclude_globbing_filelist_progress_option into functional/test_selection.py, which shows the error reported in Bug #1264744 - that the --exclude-globbing-filelist does not backup the correct files if the --progress option is used. Test is marked as an expected failure so as not to cause the test suite to fail.

=== modified file 'testing/functional/test_selection.py'
--- testing/functional/test_selection.py	2015-01-08 13:09:23 +0000
+++ testing/functional/test_selection.py	2015-01-13 01:27:20 +0000
@@ -343,6 +343,41 @@
         restored = self.directory_tree_to_list_of_lists(restore_dir)
         self.assertEqual(restored, self.expected_restored_tree_with_trailing_space)
 
+    @unittest.expectedFailure
+    def test_exclude_globbing_filelist_progress_option(self):
+        """Test that exclude globbing filelist is unaffected by the --progress option"""
+        # ToDo - currently fails. Bug #1264744 (https://bugs.launchpad.net/duplicity/+bug/1264744)
+        # Create a filelist identical to that used in test_exclude_globbing_filelist
+        with open('testfiles/exclude.txt', 'w') as f:
+            f.write('+ testfiles/select2/3/3sub3/3sub3sub2/3sub3sub2_file.txt\n'
+                    'testfiles/select2/3/3sub3/3sub3sub2\n'
+                    '+ testfiles/select2/3/3sub2/3sub2sub2\n'
+                    '+ testfiles/select2/3/3sub3\n'
+                    '- testfiles/select2/3/3sub1\n'  # - added to ensure it makes no difference
+                    'testfiles/select2/2/2sub1/2sub1sub3\n'
+                    'testfiles/select2/2/2sub1/2sub1sub2\n'
+                    '+ testfiles/select2/2/2sub1\n'
+                    'testfiles/select2/1/1sub3/1sub3sub2\n'
+                    'testfiles/select2/1/1sub3/1sub3sub1\n'
+                    'testfiles/select2/1/1sub2/1sub2sub3\n'
+                    '+ testfiles/select2/1/1sub2/1sub2sub1\n'
+                    'testfiles/select2/1/1sub1/1sub1sub3/1sub1sub3_file.txt\n'
+                    'testfiles/select2/1/1sub1/1sub1sub2\n'
+                    '- testfiles/select2/1/1sub2\n'  # - added to ensure it makes no difference
+                    '+ testfiles/select2/1.py\n'
+                    '+ testfiles/select2/3\n'
+                    '+ testfiles/select2/1\n'
+                    'testfiles/select2/**')
+
+        # Backup the files exactly as in test_exclude_globbing_filelist, but with the --progress option
+        self.backup("full", "testfiles/select2", options=["--exclude-globbing-filelist=testfiles/exclude.txt",
+                                                          "--progress"])
+        self.restore()
+        restore_dir = 'testfiles/restore_out'
+        restored = self.directory_tree_to_list_of_lists(restore_dir)
+        # The restored files should match those restored in test_exclude_globbing_filelist
+        self.assertEqual(restored, self.expected_restored_tree)
+
 class TestIncludeGlobbingFilelistTest(IncludeExcludeFunctionalTest):
     """
     Test --include-globbing-filelist using duplicity binary.