[lnst] NetTestController: print value of slave exceptions

[Jiří Pírko]

commit 6f49136ed1c4c143a8a60c094abc1d92123dc30c
Author: Ondrej Lichtner <olichtne(a)redhat.com&gt;
Date:   Mon Sep 23 14:15:46 2013 +0200

    NetTestController: print value of slave exceptions
    
    Previously the controller would only print that there was an exception
    raised on a certain slave machine, and there would be a traceback in
    debug logs from that slave. Now the value of the exception will be added
    to our controller logs, that makes it easier to spot what went wrong
    without looking up the traceback.
    
    Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
    Signed-off-by: Jiri Pirko <jiri(a)resnulli.us&gt;

 lnst/Controller/NetTestController.py       |    2 +-
 lnst/Controller/NetTestResultSerializer.py |    2 +-
 lnst/Slave/NetTestSlave.py                 |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/lnst/Controller/NetTestController.py b/lnst/Controller/NetTestController.py
index acef4aa..02d38c8 100644
--- a/lnst/Controller/NetTestController.py
+++ b/lnst/Controller/NetTestController.py
@@ -755,7 +755,7 @@ class MessageDispatcher(ConnectionHandler):
             machine = self._machines[message[0]]
             machine.interface_update(message[1])
         elif message[1]["type"] == "exception":
-            msg = "Recieved an exception from slave: %s" % message[0]
+            msg = "Slave %s: %s" % (message[0],
message[1]["Exception"])
             raise CommandException(msg)
         elif message[1]["type"] == "error":
             msg = "Recieved an error message from slave %s: %s" %\
diff --git a/lnst/Controller/NetTestResultSerializer.py
b/lnst/Controller/NetTestResultSerializer.py
index 514988b..9c26dfc 100644
--- a/lnst/Controller/NetTestResultSerializer.py
+++ b/lnst/Controller/NetTestResultSerializer.py
@@ -76,7 +76,7 @@ class NetTestResultSerializer:
             if recipe["result"] == "FAIL" and \
                "err_msg" in recipe and recipe["err_msg"] !=
"":
                 err_msg = recipe["err_msg"]
-                output_pairs.append((4*" " + "error message:" +
err_msg, ""))
+                output_pairs.append((4*" " + "error message: " +
err_msg, ""))
 
             seq_num = 1
             for task in recipe["tasks"]:
diff --git a/lnst/Slave/NetTestSlave.py b/lnst/Slave/NetTestSlave.py
index b867db2..76359d5 100644
--- a/lnst/Slave/NetTestSlave.py
+++ b/lnst/Slave/NetTestSlave.py
@@ -489,7 +489,7 @@ class NetTestSlave:
                     type, value, tb = sys.exc_info()
                     exc_trace = ''.join(traceback.format_exception(type,
                                                                    value, tb))
-                    response = {"type": "exception",
"Exception": exc_trace}
+                    response = {"type": "exception",
"Exception": value}
 
                     self._server_handler.send_data_to_ctl(response)
                     return