Merge pull request #4076 from ghedo/direct_type

[youtube-dl] / test / test_utils.py
diff --git a/test/test_utils.py b/test/test_utils.py

index bcca0efead42b85f39337a4c28f0d654447cd8e2..e59547784578e8ed7eef6b88c571629c44ccec43 100644 (file)
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -20,7 +20,6 @@ from youtube_dl.utils import (
      encodeFilename,
      find_xpath_attr,
      fix_xml_ampersands,
-    get_meta_content,
      orderedSet,
      OnDemandPagedList,
      InAdvancePagedList,
@@ -45,6 +44,7 @@ from youtube_dl.utils import (
      escape_rfc3986,
      escape_url,
      js_to_json,
+    get_filesystem_encoding,
  )
  
  
@@ -154,17 +154,6 @@ class TestUtil(unittest.TestCase):
          self.assertEqual(find_xpath_attr(doc, './/node', 'x', 'a'), doc[1])
          self.assertEqual(find_xpath_attr(doc, './/node', 'y', 'c'), doc[2])
  
-    def test_meta_parser(self):
-        testhtml = '''
-        <head>
-            <meta name="description" content="foo &amp; bar">
-            <meta content='Plato' name='author'/>
-        </head>
-        '''
-        get_meta = lambda name: get_meta_content(name, testhtml)
-        self.assertEqual(get_meta('description'), 'foo & bar')
-        self.assertEqual(get_meta('author'), 'Plato')
-
      def test_xpath_with_ns(self):
          testxml = '''<root xmlns:media="http://example.com/">
              <media:song>
@@ -286,6 +275,7 @@ class TestUtil(unittest.TestCase):
          self.assertEqual(parse_iso8601('2014-03-23T23:04:26+0100'), 1395612266)
          self.assertEqual(parse_iso8601('2014-03-23T22:04:26+0000'), 1395612266)
          self.assertEqual(parse_iso8601('2014-03-23T22:04:26Z'), 1395612266)
+        self.assertEqual(parse_iso8601('2014-03-23T22:04:26.1234Z'), 1395612266)
  
      def test_strip_jsonp(self):
          stripped = strip_jsonp('cb ([ {"id":"532cb",\n\n\n"x":\n3}\n]\n);')