Integrate with autotest log.

server/site_wifitest.py

 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import common, fnmatch, logging, os, re, string, threading, time
 
 from autotest_lib.server import autotest, hosts, subcommand
 from autotest_lib.server import site_bsd_router
 from autotest_lib.server import site_linux_router
 
@@ skipping 48 matching lines @@
     by adding a new class and auto-selecting it in __init__.
 
     The WiFiTest class could be generalized to handle clients other than
     ChromeOS; this would useful for systems that use Network Manager or
     wpa_supplicant directly.
     """
 
     def __init__(self, name, steps, config):
         self.name = name
         self.steps = steps
+
         router = config['router']
-
         self.router = hosts.create_host(router['addr'])
         # NB: truncate SSID to 32 characters
         self.defssid = self.__get_defssid(router['addr'])[0:32]
 
         if 'type' not in router:
             # auto-detect router type
             if site_linux_router.isLinuxRouter(self.router):
                 router['type'] = 'linux'
             elif site_bsd_router.isBSDRouter(self.router):
                 router['type'] = 'bsd'
             else:
-                raise Exception('Unable to autodetect router type')
+                 raise error.TestFail('Unable to autodetect router type')
         if router['type'] == 'linux':
             self.wifi = site_linux_router.LinuxRouter(self.router, router,
                 self.defssid)
         elif router['type'] == 'bsd':
             self.wifi = site_bsd_router.BSDRouter(self.router, router,
                 self.defssid)
         else:
-            raise Exception('Unsupported router')
+            raise error.TestFail('Unsupported router')
 
         #
         # The client machine must be reachable from the control machine.
         # The address on the wifi network is retrieved each time it
         # associates to the router.
         #
         client = config['client']
         self.client = hosts.create_host(client['addr'])
         self.client_at = autotest.Autotest(self.client)
         self.client_wifi_ip = None       # client's IP address on wifi net
@@ skipping 53 matching lines @@
             func = getattr(self, method, None)
             if func is None:
                 func = getattr(self.wifi, method, None)
             if func is not None:
                 try:
                     func(params)
                 except Exception, e:
                     logging.error("%s: Step '%s' failed: %s; abort test",
                         self.name, method, str(e))
                     self.cleanup(params)
+                    raise e
                     break
             else:
                 logging.error("%s: Step '%s' unknown; abort test",
                     self.name, method)
                 self.cleanup(params)
                 break
 
 
     def __get_connect_script(self, params):
         # Something is off in our current setup so we'll set the assoc_timeout
@@ skipping 72 matching lines @@
         sys.exit(6)
 print "assoc %3.1f secs config %3.1f secs" % (assoc_time, config_time)
 sys.exit(0)'''
 
 
     def __get_ipaddr(self, host, ifnet):
         # XXX gotta be a better way to do this
         result = host.run("ifconfig %s" % ifnet)
         m = re.search('inet addr:([^ ]*)', result.stdout)
         if m is None:
-            raise Except, "No inet address found"
+             raise error.TestFail("No inet address found")
         return m.group(1)
 
 
     def connect(self, params):
         """ Connect client to AP/router """
         if 'ssid' not in params:
             params['ssid'] = self.defssid
         script = self.__get_connect_script(params)
         result = self.client.run("python<<'EOF'\n%s\nEOF\n" % script)
         print "%s: %s" % (self.name, result.stdout[0:-1])
@@ skipping 402 matching lines @@
 
     server = config['server']
     if server_addr is not None:
         server['addr'] = server_addr;
     # TODO(sleffler) check for wifi_addr when no control address
 
     # tag jobs w/ the router's address on the control network
     config['tagname'] = router['addr']
 
     return config