Update vendored guessit to 3.1.1

Updates python-dateutil to 2.8.2
Updates rebulk to 2.0.1

libs/common/guessit/test/test_yml.py

@@ -7,9 +7,8 @@ import os
 from io import open  # pylint: disable=redefined-builtin
 
 import babelfish
-import pytest
-import six
-import yaml
+import six  # pylint:disable=wrong-import-order
+import yaml  # pylint:disable=wrong-import-order
 from rebulk.remodule import re
 from rebulk.utils import is_iterable
 
@@ -21,13 +20,6 @@ logger = logging.getLogger(__name__)
 
 __location__ = os.path.realpath(os.path.join(os.getcwd(), os.path.dirname(__file__)))
 
-filename_predicate = None
-string_predicate = None
-
-
-# filename_predicate = lambda filename: 'episode_title' in filename
-# string_predicate = lambda string: '-DVD.BlablaBla.Fix.Blablabla.XVID' in string
-
 
 class EntryResult(object):
     def __init__(self, string, negates=False):
@@ -134,7 +126,49 @@ class TestYml(object):
 
     options_re = re.compile(r'^([ +-]+)(.*)')
 
-    files, ids = files_and_ids(filename_predicate)
+    def _get_unique_id(self, collection, base_id):
+        ret = base_id
+        i = 2
+        while ret in collection:
+            suffix = "-" + str(i)
+            ret = base_id + suffix
+            i += 1
+        return ret
+
+    def pytest_generate_tests(self, metafunc):
+        if 'yml_test_case' in metafunc.fixturenames:
+            entries = []
+            entry_ids = []
+            entry_set = set()
+
+            for filename, _ in zip(*files_and_ids()):
+                with open(os.path.join(__location__, filename), 'r', encoding='utf-8') as infile:
+                    data = yaml.load(infile, OrderedDictYAMLLoader)
+
+                last_expected = None
+                for string, expected in reversed(list(data.items())):
+                    if expected is None:
+                        data[string] = last_expected
+                    else:
+                        last_expected = expected
+
+                default = None
+                try:
+                    default = data['__default__']
+                    del data['__default__']
+                except KeyError:
+                    pass
+
+                for string, expected in data.items():
+                    TestYml.set_default(expected, default)
+                    string = TestYml.fix_encoding(string, expected)
+
+                    entries.append((filename, string, expected))
+                    unique_id = self._get_unique_id(entry_set, '[' + filename + '] ' + str(string))
+                    entry_set.add(unique_id)
+                    entry_ids.append(unique_id)
+
+            metafunc.parametrize('yml_test_case', entries, ids=entry_ids)
 
     @staticmethod
     def set_default(expected, default):
@@ -143,34 +177,8 @@ class TestYml(object):
                 if k not in expected:
                     expected[k] = v
 
-    @pytest.mark.parametrize('filename', files, ids=ids)
-    def test(self, filename, caplog):
-        caplog.set_level(logging.INFO)
-        with open(os.path.join(__location__, filename), 'r', encoding='utf-8') as infile:
-            data = yaml.load(infile, OrderedDictYAMLLoader)
-        entries = Results()
-
-        last_expected = None
-        for string, expected in reversed(list(data.items())):
-            if expected is None:
-                data[string] = last_expected
-            else:
-                last_expected = expected
-
-        default = None
-        try:
-            default = data['__default__']
-            del data['__default__']
-        except KeyError:
-            pass
-
-        for string, expected in data.items():
-            TestYml.set_default(expected, default)
-            entry = self.check_data(filename, string, expected)
-            entries.append(entry)
-        entries.assert_ok()
-
-    def check_data(self, filename, string, expected):
+    @classmethod
+    def fix_encoding(cls, string, expected):
         if six.PY2:
             if isinstance(string, six.text_type):
                 string = string.encode('utf-8')
@@ -183,16 +191,23 @@ class TestYml(object):
                 expected[k] = v
         if not isinstance(string, str):
             string = str(string)
-        if not string_predicate or string_predicate(string):  # pylint: disable=not-callable
-            entry = self.check(string, expected)
-            if entry.ok:
-                logger.debug('[%s] %s', filename, entry)
-            elif entry.warning:
-                logger.warning('[%s] %s', filename, entry)
-            elif entry.error:
-                logger.error('[%s] %s', filename, entry)
-                for line in entry.details:
-                    logger.error('[%s] %s', filename, ' ' * 4 + line)
+        return string
+
+    def test_entry(self, yml_test_case):
+        filename, string, expected = yml_test_case
+        result = self.check_data(filename, string, expected)
+        assert not result.error
+
+    def check_data(self, filename, string, expected):
+        entry = self.check(string, expected)
+        if entry.ok:
+            logger.debug('[%s] %s', filename, entry)
+        elif entry.warning:
+            logger.warning('[%s] %s', filename, entry)
+        elif entry.error:
+            logger.error('[%s] %s', filename, entry)
+            for line in entry.details:
+                logger.error('[%s] %s', filename, ' ' * 4 + line)
         return entry
 
     def check(self, string, expected):