Shorten traceback of ignored exceptions

slapos/libnetworkcache.py

@@ -41,6 +41,16 @@ logger = logging.getLogger('networkcache')
 logger.setLevel(logging.INFO)
 
 
+class short_exc_info(tuple):
+
+  def __str__(self):
+    t, v, tb = self
+    filename, lineno, name, line = traceback.extract_tb(tb, 1)[0]
+    l = ['%s:%s\n' % (filename, lineno)]
+    l += traceback.format_exception_only(t, v)
+    return ''.join(l).rstrip()
+
+
 class NetworkcacheClient(object):
   '''
     NetworkcacheClient is a wrapper for httplib.
@@ -108,7 +118,8 @@ class NetworkcacheClient(object):
       if isinstance(v, NetworkcacheException):
         logger.info(*v.args)
       else:
-        logger.info("ignored unhandled exception", exc_info=(t, v, tb))
+        logger.info("ignored unhandled exception at %s",
+                    short_exc_info((t, v, tb)))
       return True
 
   def _request(self, where, name=None, data=None, headers=None):

slapos/libnetworkcachetests.py

@@ -194,7 +194,7 @@ class OnlineMixin:
     del self.handler
 
   def assertRaised(self, exc_type):
-    self.assertEqual(exc_type, self.handler.buffer.pop(0).exc_info[0])
+    self.assertIs(exc_type, self.handler.buffer.pop(0).args[0][0])
 
   def assertLog(self, msg=None):
     try: