commit beaab9c04b1e69100cc021dc79995687e8b3e7f3
author Kalin Stoyanov <kalin@chromium.org> Mon Nov 24 15:02:38 2014 -0800
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Tue Nov 25 03:47:15 2014 +0000
tree 6773f53461b2ba94b16f61ffa34b1212a3377189
parent be73c2e2951735371576dab2a5343c040154e7aa

Improve logging

BUG=None
TEST=Locally tested

Change-Id: I7fd4f77143b4ab75a74de28861e979c6ca147661
Reviewed-on: https://chromium-review.googlesource.com/231385
Reviewed-by: Sridhar Sonti <sontis@chromium.org>
Commit-Queue: Kalin Stoyanov <kalin@chromium.org>
Tested-by: Kalin Stoyanov <kalin@chromium.org>

server/site_tests/kernel_ExternalUsbPeripheralsDetectionTest/kernel_ExternalUsbPeripheralsDetectionTest.py

diff --git a/server/site_tests/kernel_ExternalUsbPeripheralsDetectionTest/kernel_ExternalUsbPeripheralsDetectionTest.py b/server/site_tests/kernel_ExternalUsbPeripheralsDetectionTest/kernel_ExternalUsbPeripheralsDetectionTest.py
index 513e48a..9e0417e 100644
--- a/server/site_tests/kernel_ExternalUsbPeripheralsDetectionTest/kernel_ExternalUsbPeripheralsDetectionTest.py
+++ b/server/site_tests/kernel_ExternalUsbPeripheralsDetectionTest/kernel_ExternalUsbPeripheralsDetectionTest.py
@@ -34,7 +34,7 @@
 
         @returns True if command line output is matched successfuly; Else False
         """
-        usb_check_result = True
+        failed = list()
         for cmd in self.usb_checks.keys():
             out_match_list = self.usb_checks.get(cmd)
             logging.info('Running %s',  cmd)
@@ -48,10 +48,8 @@
                     match_result = (match_result or
                         re.search(out_match, cmd_out_line) != None)
                 if not match_result:
-                    logging.debug('USB CHECKS details failed for cmd %s:', cmd)
-                    logging.debug('with output : \n %s', '\n'.join(cmd_out_lines))
-                usb_check_result = usb_check_result and match_result
-        return usb_check_result
+                    failed.append((cmd,out_match))
+        return failed
 
 
     def get_usb_device_dirs(self):
@@ -126,9 +124,9 @@
         logging.debug('Connected devices list: %s', diff_list)
 
         # Test 1: check USB peripherals info in detail
-        if not self.check_usb_peripherals_details():
-            raise error.TestError('Some of the USB peripherals were not'
-                                  ' detected : test failed')
+        failed = self.check_usb_peripherals_details()
+        if len(failed)> 0:
+            raise error.TestError('USB device not detected %s', str(failed))
 
         # Test 2: check USB device dir under /sys/bus/usb/devices
         vendor_ids = {}
@@ -162,4 +160,4 @@
                                               .stdout.strip())
                         logging.info('%s', link)
                 if not flag:
-                    raise error.TestFail('Drivers are not loaded')
+                    raise error.TestFail('Drivers are not loaded - %s', driver_path)