commit 2d1d561eeb8c91a350380c9279cb9853bd7a275d
author Neels Hofmeyr <neels@hofmeyr.de> Mon May 22 20:02:41 2017 +0200
committer Neels Hofmeyr <nhofmeyr@sysmocom.de> Mon May 29 00:18:42 2017 +0200
tree 8d82ca0c3a4df4e74c38043745d0b3d8c36975ad
parent 927344b4dc1223e0f455971ef9293c90fb7d3a80

resource error logging that is easier to understand

Log what a suite requested, what it has reserved and the complete resource
state.

Change-Id: Ic6887bbe5fe74a73f0e344cd4078dd7ed989cc15

src/osmo_gsm_tester/suite.py

diff --git a/src/osmo_gsm_tester/suite.py b/src/osmo_gsm_tester/suite.py
index d55ee92..5d03b95 100644
--- a/src/osmo_gsm_tester/suite.py
+++ b/src/osmo_gsm_tester/suite.py
@@ -22,6 +22,7 @@
 import time
 import copy
 import traceback
+import pprint
 from . import config, log, template, util, resource, schema, ofono_client, osmo_nitb, event_loop
 from . import test
 
@@ -130,7 +131,8 @@
                 ftype = type(e).__name__
                 fmsg = repr(e) + '\n' + traceback.format_exc().rstrip()
                 if isinstance(e, resource.NoResourceExn):
-                    fmsg += '\n' + 'Current resource state:\n' + repr(suite_run.reserved_resources)
+                    fmsg += suite_run.resource_status_str()
+
             self.set_fail(ftype, fmsg, False)
 
         finally:
@@ -314,6 +316,13 @@
         self.log('prompt entered:', repr(entered))
         return entered
 
+    def resource_status_str(self):
+        return '\n'.join(('',
+            'SUITE RUN: %s' % self.origin_id(),
+            'ASKED FOR:', pprint.pformat(self._resource_requirements),
+            'RESERVED COUNT:', pprint.pformat(self.reserved_resources.counts()),
+            'RESOURCES STATE:', repr(self.reserved_resources)))
+
 loaded_suite_definitions = {}
 
 def load(suite_name):