modified filename escaping to a "smarter" one

[youtube-dl] / test / test_utils.py

diff --git a/test/test_utils.py b/test/test_utils.py
index fd3ac4d46c25dbe159a743172c9e855667b13f83..87884012040bd71f33cc6274ad7423a6c635c2d7 100644 (file)
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -13,8 +13,8 @@ from youtube_dl.utils import orderedSet
 
 class TestUtil(unittest.TestCase):
        def test_timeconvert(self):
-               self.assertIsNone(timeconvert(''))
-               self.assertIsNone(timeconvert('bougrg'))
+               self.assertTrue(timeconvert('') is None)
+               self.assertTrue(timeconvert('bougrg') is None)
 
        def test_sanitize_filename(self):
                self.assertEqual(sanitize_filename(u'abc'), u'abc')
@@ -22,13 +22,13 @@ class TestUtil(unittest.TestCase):
 
                self.assertEqual(sanitize_filename(u'123'), u'123')
 
-               self.assertEqual(u'abc_de', sanitize_filename(u'abc/de'))
-               self.assertIn(u'de', sanitize_filename(u'abc/de'))
-               self.assertNotIn(u'/', sanitize_filename(u'abc/de///'))
+               self.assertEqual(u'abc-de', sanitize_filename(u'abc/de'))
+               self.assertFalse(u'/' in sanitize_filename(u'abc/de///'))
 
-               self.assertEqual(u'abc_de', sanitize_filename(u'abc\\de'))
-               self.assertEqual(u'abc_de', sanitize_filename(u'abc\\de'))
-               self.assertIn(u'de', sanitize_filename(u'abc\\de'))
+               self.assertEqual(u'abc-de', sanitize_filename(u'abc/<>\\*|de'))
+               self.assertEqual(u'xxx', sanitize_filename(u'xxx/<>\\*|'))
+               self.assertEqual(u'yes no', sanitize_filename(u'yes? no'))
+               self.assertEqual(u'this - that', sanitize_filename(u'this: that'))
 
                self.assertEqual(sanitize_filename(u'ä'), u'ä')
                self.assertEqual(sanitize_filename(u'кириллица'), u'кириллица')