More work on wifi tests

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 319 matching lines @@
     def client_powersave_off(self, params):
         """ Disable power save operation """
         self.client.run("iwconfig %s power off" % self.client_wlanif)
 
 
     def __client_check(self, param, want):
         """ Verify negotiated station mode parameter """
         result = self.client.run("cat '%s/%s'" %
             (self.client_debugfs_path, param))
         got = result.stdout.rstrip()       # NB: chop \n
-        if got != want: 
-            logging.error("client_check_%s: wanted %s got %s",
+        if got != want:
+            raise error.TestFail("client_check_%s: wanted %s got %s",
                 param, want, got)
-            raise AssertionError
 
 
     def client_check_bintval(self, params):
         """ Verify negotiated beacon interval """
         self.__client_check("beacon_int", params[0])
 
 
     def client_check_dtimperiod(self, params):
         """ Verify negotiated DTIM period """
         self.__client_check("dtim_period", params[0])
@@ skipping 287 matching lines @@
 
 
 def __byfile(a, b):
     if a['file'] < b['file']:
         return -1
     elif a['file'] > b['file']:
         return 1
     else:
         return 0
 
-def read_tests(dir, pat):
+def read_tests(dir, *args):
     """
     Collect WiFi test tuples from files.  File names are used to
     sort the test objects so the convention is to name them NNN<test>
     where NNN is a decimal number used to sort and <test> is an
     identifying name for the test; e.g. 000Check11b
     """
     tests = []
     for file in os.listdir(dir):
-        if fnmatch.fnmatch(file, pat):
+        if any(fnmatch.fnmatch(file, pat) for pat in args):
             fd = open(os.path.join(dir, file));
             try:
                 test = eval(fd.read())
             except Exception, e:
                 logging.error("%s: %s", os.path.join(dir, file), str(e))
                 raise e
             test['file'] = file
             tests.append(test)
     # use filenames to sort
     return sorted(tests, cmp=__byfile)
@@ skipping 17 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