Merge branch 'stable'

1 files changed, 3 insertions, 9 deletions

diff --git a/tests/test_metadata.py b/tests/test_metadata.py
index 14ab51ccd..868b05139 100644
--- a/tests/test_metadata.py
+++ b/tests/test_metadata.py
@@ -12,12 +12,10 @@
 # adapted from an example of bibliographic metadata at
 # http://docutils.sourceforge.net/docs/user/rst/demo.txt
 
-from util import with_app
+import pytest
 
-from nose.tools import assert_equal
 
-
-@with_app('pseudoxml')
+@pytest.mark.sphinx('pseudoxml')
 def test_docinfo(app, status, warning):
     """
     Inspect the 'docinfo' metadata stored in the first node of the document.
@@ -53,8 +51,4 @@ def test_docinfo(app, status, warning):
         'orphan': u'',
         'nocomments': u'',
     }
-    # I like this way of comparing dicts - easier to see the error.
-    for key in exampledocinfo:
-        yield assert_equal, exampledocinfo.get(key), expecteddocinfo.get(key)
-    # but then we still have to check for missing keys
-    yield assert_equal, set(expecteddocinfo.keys()), set(exampledocinfo.keys())
+    assert exampledocinfo == expecteddocinfo