commit 5a39eefe57374c73e442fc242a05723031d6cfbd
author Cheng-Yi Chiang <cychiang@chromium.org> Wed Apr 26 18:30:04 2017 +0800
committer chrome-bot <chrome-bot@chromium.org> Thu Apr 27 22:54:49 2017 -0700
tree d3127797844bca79227e17c9469f6f6e90b344ae
parent 8db9ce0da0553a743be81fe1317dcb646d73d42a

[autotest] audio_test_utils: Makes the error messages easier to read

BUG=chromium:710903
TEST=check error messages.

Change-Id: Id082591977438915b38611b4de3372708f44dbc4
Reviewed-on: https://chromium-review.googlesource.com/487787
Commit-Ready: Cheng-Yi Chiang <cychiang@chromium.org>
Tested-by: Cheng-Yi Chiang <cychiang@chromium.org>
Reviewed-by: Wai-Hong Tam <waihong@google.com>
Reviewed-by: Kalin Stoyanov <kalin@chromium.org>

client/cros/chameleon/audio_test_utils.py

diff --git a/client/cros/chameleon/audio_test_utils.py b/client/cros/chameleon/audio_test_utils.py
index 01dd4fc..84abd90 100644
--- a/client/cros/chameleon/audio_test_utils.py
+++ b/client/cros/chameleon/audio_test_utils.py
@@ -83,8 +83,8 @@
     out_audio_nodes, in_audio_nodes = audio_nodes
     if (in_audio_nodes != None and
         sorted(curr_in_nodes) != sorted(in_audio_nodes)):
-        raise error.TestFail('Wrong input node(s) selected %s '
-                'instead %s!' % (str(curr_in_nodes), str(in_audio_nodes)))
+        raise error.TestFail('Wrong input node(s) selected: %s '
+                'expected: %s' % (str(curr_in_nodes), str(in_audio_nodes)))
 
     # Treat line-out node as headphone node in Chameleon test since some
     # Cros devices detect audio board as lineout. This actually makes sense
@@ -95,7 +95,7 @@
     if (out_audio_nodes != None and
         sorted(curr_out_nodes) != sorted(out_audio_nodes)):
         raise error.TestFail('Wrong output node(s) selected %s '
-                'instead %s!' % (str(curr_out_nodes), str(out_audio_nodes)))
+                'expected: %s' % (str(curr_out_nodes), str(out_audio_nodes)))
 
 
 def check_plugged_nodes(audio_facade, audio_nodes):
@@ -114,12 +114,12 @@
     out_audio_nodes, in_audio_nodes = audio_nodes
     if (in_audio_nodes != None and
         sorted(curr_in_nodes) != sorted(in_audio_nodes)):
-        raise error.TestFail('Wrong input node(s) plugged %s '
-                'instead %s!' % (str(curr_in_nodes), str(in_audio_nodes)))
+        raise error.TestFail('Wrong input node(s) plugged: %s '
+                'expected: %s!' % (str(curr_in_nodes), str(in_audio_nodes)))
     if (out_audio_nodes != None and
         sorted(curr_out_nodes) != sorted(out_audio_nodes)):
-        raise error.TestFail('Wrong output node(s) plugged %s '
-                'instead %s!' % (str(curr_out_nodes), str(out_audio_nodes)))
+        raise error.TestFail('Wrong output node(s) plugged: %s '
+                'expected: %s!' % (str(curr_out_nodes), str(out_audio_nodes)))
 
 
 def bluetooth_nodes_plugged(audio_facade):