more WiFi testing fixes

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 246 matching lines @@
              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])
+        print "%s: %s" % (self.name, result.stdout.rstrip())
 
         # fetch IP address of wireless device
         self.client_wifi_ip = self.__get_ipaddr(self.client, self.client_wlanif)
         logging.info("%s: client WiFi-IP is %s", self.name, self.client_wifi_ip)
         # TODO(sleffler) not right for non-mac80211 devices
         # TODO(sleffler) verify debugfs is mounted @ /sys/kernel/debug
         self.client_debugfs_path = "/sys/kernel/debug/ieee80211/%s/netdev:%s" \
             % ("phy0", self.client_wlanif)
 
 
@@ skipping 34 matching lines @@
 sys.exit(0)'''
 
 
     def disconnect(self, params):
         """ Disconnect previously connected client """
         if 'ssid' not in params:
             params['ssid'] = self.defssid
         self.client_ping_bg_stop({})
         script = self.__get_disconnect_script(params)
         result = self.client.run("python<<'EOF'\n%s\nEOF\n" % script)
-        print "%s: %s" % (self.name, result.stdout[0:-1])
+        print "%s: %s" % (self.name, result.stdout.rstrip())
 
 
     def client_powersave_on(self, params):
         """ Enable power save operation """
         self.client.run("iwconfig %s power on" % self.client_wlanif)
 
 
     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.router.run("cat %s/%s" %
-            (self.client_debugfs_path, param_))
-        if result != want:
+        result = self.client.run("cat '%s/%s'" %
+            (self.client_debugfs_path, param))
+        got = result.stdout.rstrip()       # NB: chop \n

[seano, 2010/04/28 19:05:53]

unnecessary comment..

+        if got != want: 
             logging.error("client_check_%s: wanted %s got %s",
-                param, want, result)
+                param, want, got)
             raise AssertionError
 
 
     def client_check_bintval(self, params):
         """ Verify negotiated beacon interval """
-        _self._client_check("beacon_int", params[0])
+        self.__client_check("beacon_int", params[0])
 
 
     def client_check_dtimperiod(self, params):
         """ Verify negotiated DTIM period """
-        _self._client_check("dtim_period", params[0])
+        self.__client_check("dtim_period", params[0])
 
 
     def client_check_rifs(self, params):
         """ Verify negotiated RIFS setting """
-        _self._client_check("rifs", params[0])
+        self.__client_check("rifs", params[0])
 
 
     def client_check_shortgi20(self, params):
         """ Verify negotiated Short GI setting """
-        _self._client_check("sgi20", params[0])
+        self.__client_check("sgi20", params[0])
 
 
     def client_check_shortgi40(self, params):
         """ Verify negotiated Short GI setting """
-        _self._client_check("sgi40", params[0])
+        self.__client_check("sgi40", params[0])
 
 
     def client_check_shortslot(self, params):
         """ Verify negotiated Short Slot setting """
-        _self._client_check("short_slot", params[0])
+        self.__client_check("short_slot", params[0])
 
 
     def client_check_protection(self, params):
         """ Verify negotiated CTS protection setting """
-        _self._client_check("cts_prot", params[0])
+        self.__client_check("cts_prot", params[0])
 
 
     def client_monitor_start(self, params):
         """ Start monitoring system events """
         raise NotImplemented("client_monitor_start")
 
 
     def client_monitor_stop(self, params):
         """ Stop monitoring system events """
         raise NotImplemented("client_monitor_stop")
@@ skipping 299 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