duplicity-team team mailing list archive

[Aaron Whitehouse <lists@xxxxxxxxxxxxxxxxxx>]

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

Requested reviews:
  duplicity-team (duplicity-team)

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

Re-enable unit.test_selection tests that had been temporarily commented out.
-- 
Your team duplicity-team is requested to review the proposed merge of lp:~aaron-whitehouse/duplicity/reenable_tests into lp:duplicity.

=== modified file 'po/duplicity.pot'
--- po/duplicity.pot	2015-07-29 09:52:13 +0000
+++ po/duplicity.pot	2015-07-29 10:59:27 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: Kenneth Loafman <kenneth@xxxxxxxxxxx>\n"
-"POT-Creation-Date: 2015-07-29 10:46+0100\n"
+"POT-Creation-Date: 2015-07-29 11:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"

=== modified file 'testing/unit/test_selection.py'
--- testing/unit/test_selection.py	2015-07-29 09:52:13 +0000
+++ testing/unit/test_selection.py	2015-07-29 10:59:27 +0000
@@ -54,7 +54,6 @@
 
     def test_tuple_include(self):
         """Test include selection function made from a regular filename"""
-        # Tests never worked with get_normal_sf
         self.assertRaises(FilePrefixError, self.Select.glob_get_normal_sf, "foo", 1)
 
         sf2 = self.Select.glob_get_sf("testfiles/select/usr/local/bin/", 1)
@@ -159,15 +158,15 @@
         select = Select(root)
 
         assert select.glob_get_sf("/", 1)(root) == 1
-        # assert select.glob_get_sf("/foo", 1)(root) == 1
-        # assert select.glob_get_sf("/foo/bar", 1)(root) == 1
+        assert select.glob_get_sf("/foo", 1)(root) == 1
+        assert select.glob_get_sf("/foo/bar", 1)(root) == 1
         assert select.glob_get_sf("/", 0)(root) == 0
         assert select.glob_get_sf("/foo", 0)(root) is None
 
         assert select.glob_get_sf("**.py", 1)(root) == 2
         assert select.glob_get_sf("**", 1)(root) == 1
         assert select.glob_get_sf("ignorecase:/", 1)(root) == 1
-        # assert select.glob_get_sf("**.py", 0)(root) is None
+        assert select.glob_get_sf("**.py", 0)(root) is None
         assert select.glob_get_sf("**", 0)(root) == 0
         assert select.glob_get_sf("/foo/*", 0)(root) is None