Merge lp:~tcole/ubuntuone-dev-tools/qname-in-errors into lp:ubuntuone-dev-tools

[Tim Cole]

Show qualified class names in errors.

Show qualified class names in errors.

[Manuel de la Peña (mandel)]

review: Approve

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

=== modified file 'ubuntuone/devtools/testing/txcheck.py'
--- ubuntuone/devtools/testing/txcheck.py	2011-10-24 15:56:44 +0000
+++ ubuntuone/devtools/testing/txcheck.py	2011-10-27 10:21:30 +0000
@@ -30,7 +30,7 @@
 
 def type_to_name(type_obj):
     """Return a name for a type."""
-    package_name = getattr(type_obj, '__package__', None)
+    package_name = getattr(type_obj, '__module__', None)
     if package_name:
         return "%s.%s" % (package_name, type_obj.__name__)
     else:

=== modified file 'ubuntuone/devtools/tests/test_txcheck.py'
--- ubuntuone/devtools/tests/test_txcheck.py	2011-10-24 14:53:26 +0000
+++ ubuntuone/devtools/tests/test_txcheck.py	2011-10-27 10:21:30 +0000
@@ -213,5 +213,8 @@
 
         self.assertEqual(len(result.failures), 1)
         failure = result.failures[0][1]
+        package_name = type(self).__module__
+        class_name = BrokenTestCase.__name__
+        full_method_name = "%s.%s.setUp" % (package_name, class_name)
         self.assertNotEqual(failure.find("SuperResultDiscarded"), -1)
-        self.assertNotEqual(failure.find("BrokenTestCase.setUp"), -1)
+        self.assertNotEqual(failure.find(full_method_name), -1)