duplicity-team team mailing list archive

[Aaron Whitehouse <lists@xxxxxxxxxxxxxxxxxx>]

Aaron Whitehouse has proposed merging lp:~aaron-whitehouse/duplicity/reactivate_progress_test into lp:duplicity.

Requested reviews:
  duplicity-team (duplicity-team)

For more details, see:
https://code.launchpad.net/~aaron-whitehouse/duplicity/reactivate_progress_test/+merge/263732

Re-enable the test of the --progress option (test_exclude_filelist_progress_option), which was marked as an expected failure. The issue causing this test to fail was fixed in revision 1095 and the test now passes.
-- 
Your team duplicity-team is requested to review the proposed merge of lp:~aaron-whitehouse/duplicity/reactivate_progress_test into lp:duplicity.

=== modified file 'testing/functional/test_selection.py'
--- testing/functional/test_selection.py	2015-03-12 18:41:32 +0000
+++ testing/functional/test_selection.py	2015-07-02 23:50:44 +0000
@@ -389,10 +389,9 @@
         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_filelist_progress_option(self):
         """Test that exclude filelist is unaffected by the --progress option"""
-        # ToDo - currently fails. Bug #1264744 (https://bugs.launchpad.net/duplicity/+bug/1264744)
+        # Regression test for Bug #1264744 (https://bugs.launchpad.net/duplicity/+bug/1264744)
         # Create a filelist identical to that used in test_exclude_filelist
         with open('testfiles/exclude.txt', 'w') as f:
             f.write('+ testfiles/select2/3/3sub3/3sub3sub2/3sub3sub2_file.txt\n'