merge with 1.0

1 files changed, 3 insertions, 3 deletions

diff --git a/tests/test_env.py b/tests/test_env.py
index 124ed08cd..a8d6bac2d 100644
--- a/tests/test_env.py
+++ b/tests/test_env.py
@@ -29,7 +29,7 @@ def teardown_module():
 
 def warning_emitted(file, text):
     for warning in warnings:
-        if len(warning) == 2 and file+':' in warning[1] and text in warning[0]:
+        if len(warning) == 2 and file in warning[1] and text in warning[0]:
             return True
     return False
 
@@ -47,8 +47,8 @@ def test_first_update():
     assert 'subdir/excluded' not in env.found_docs
 
 def test_images():
-    assert warning_emitted('images.txt', 'image file not readable: foo.png')
-    assert warning_emitted('images.txt', 'nonlocal image URI found: '
+    assert warning_emitted('images', 'image file not readable: foo.png')
+    assert warning_emitted('images', 'nonlocal image URI found: '
                            'http://www.python.org/logo.png')
 
     tree = env.get_doctree('images')