Merge lp:~mordred/testtools/add-file-to-upcall-errors into lp:testtools

[Monty Taylor]

[Jonathan Lange (jml)]

Thanks for the patch! Good idea.

I'll merge it into our new trunk, which you can find at <https://github.com/testing-cabal/testtools>.

Unmerged revisions

315. By Monty Taylor on 2013-02-07

Report filenames in upcall errors.

Match other errors, which report filenames due to having exceptions
associated with them. Since these errors don't stem from exceptions,
it's harder to directly follow where the problem came from.

=== modified file 'testtools/testcase.py'
--- testtools/testcase.py	2013-01-18 11:24:57 +0000
+++ testtools/testcase.py	2013-02-07 09:31:21 +0000
@@ -531,10 +531,11 @@
         ret = self.setUp()
         if not self.__setup_called:
             raise ValueError(
+                "In File: %s\n"
                 "TestCase.setUp was not called. Have you upcalled all the "
                 "way up the hierarchy from your setUp? e.g. Call "
                 "super(%s, self).setUp() from your setUp()."
-                % self.__class__.__name__)
+                % (self.__class__.__file__, self.__class__.__name__))
         return ret
 
     def _run_teardown(self, result):
@@ -547,10 +548,11 @@
         ret = self.tearDown()
         if not self.__teardown_called:
             raise ValueError(
+                "In File: %s\n"
                 "TestCase.tearDown was not called. Have you upcalled all the "
                 "way up the hierarchy from your tearDown? e.g. Call "
                 "super(%s, self).tearDown() from your tearDown()."
-                % self.__class__.__name__)
+                % (self.__class__.__file__, self.__class__.__name__))
         return ret
 
     def _get_test_method(self):