Nicer repr() and error message

1 files changed, 15 insertions, 1 deletions

diff --git a/paste/fixture.py b/paste/fixture.py
index 739d4a8..dc40bb2 100644
--- a/paste/fixture.py
+++ b/paste/fixture.py
@@ -763,8 +763,17 @@ class FoundFile(object):
         return s in self.bytes
 
     def mustcontain(self, s):
+        __tracebackhide__ = True
         bytes = self.bytes
-        assert s in bytes
+        if s not in bytes:
+            print 'Could not find %r in:' % s
+            print bytes
+            assert s in bytes
+
+    def __repr__(self):
+        return '<%s %s:%s>' % (
+            self.__class__.__name__,
+            self.base_path, self.path)
 
 class FoundDir(object):
 
@@ -778,6 +787,11 @@ class FoundDir(object):
         self.size = 'N/A'
         self.mtime = 'N/A'
 
+    def __repr__(self):
+        return '<%s %s:%s>' % (
+            self.__class__.__name__,
+            self.base_path, self.path)
+
 def _popget(d, key, default=None):
     """
     Pop the key if found (else return default)