autotest: push/pop a "test" profile for WiFi tests

server/site_wifitest.py

 # Copyright (c) 2011 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, datetime, 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
 from autotest_lib.server import site_linux_server
@@ skipping 134 matching lines @@
         # hosting_server is a machine which hosts network services,
         # such as VPN.
         self.hosting_server = site_linux_server.LinuxServer(self.server, server)
 
         # potential bg thread for ping untilstop
         self.ping_thread = None
 
         # potential bg thread for client network monitoring
         self.client_netdump_thread = None
         self.__client_discover_commands(client)
-        self.profile_save({})
+        self.profile_create({'name':'test'})
+        self.profile_push({'name':'test'})
         self.firewall_rules = []
 
         # interface name on client
         self.client_wlanif = client.get('wlandev',
                                         self.__get_wlan_devs(self.client)[0])
 
         # Synchronize time on all devices
         self.time_sync([])
 
         # Find all repeated steps and create iterators for them
         self.iterated_steps = {}
         step_names = [step[0] for step in steps]
         for step_name in list(set(step_names)):
             if step_names.count(step_name) > 1:
                 self.iterated_steps[step_name] = 0
 
     def cleanup(self, params):
         """ Cleanup state: disconnect client and destroy ap """
         if params.get('force_disconnect'):
             self.disconnect({})
             self.wifi.destroy({})
-        self.profile_cleanup({})
+        self.profile_pop({'name':'test'})
+        self.profile_remove({'name':'test'})
         self.client_netdump_stop({})
         self.firewall_cleanup({})
 
 
     def __must_be_installed(self, host, cmd):
         if not self.__is_installed(host, cmd):
             # TODO(sleffler): temporary debugging
             host.run("ls -a /usr/bin /usr/local/bin" % cmd, ignore_status=True)
             raise error.TestFail('Unable to find %s on %s' % (cmd, host.ip))
         return cmd
@@ skipping 905 matching lines @@
 
         self.client_suspend_thread.join()
         if self.client_suspend_thread.result.exit_status:
             raise error.TestError('suspend failed')
 
     def restart_supplicant(self, params):
         """ Restart wpa_supplicant.  Cert params are unfortunately "sticky". """
 
         self.client.run("stop wpasupplicant; start wpasupplicant")
 
-    def __list_profile(self):
-        ret = []
-        result = self.client.run('%s/test/list-entries' %
-                                 self.client_cmd_flimflam_lib)
-        for line in result.stdout.splitlines():
-            m = re.search('\[(wifi_.*)\]', line)
-            if m is not None:
-                ret.append(m.group(1))
-        return ret
 
-    def profile_save(self, params):
-        self.client_profile_list = self.__list_profile()
+    def profile_create(self, params):
+        """ Create a profile with the specified name """
+        self.client.run('%s/test/create-profile %s' %
+                        (self.client_cmd_flimflam_lib, params['name']))
 
-    def profile_cleanup(self, params):
-        exceptions = params.get('except', self.client_profile_list)
-        for entry in self.__list_profile():
-            if entry not in exceptions:
-                self.client.run('%s/test/delete-entry %s' %
-                                (self.client_cmd_flimflam_lib, entry))
+    def profile_remove(self, params):
+        """ Remove the specified profile """
+        self.client.run('%s/test/rm-profile %s' %
+                        (self.client_cmd_flimflam_lib, params['name']))
+
+    def profile_push(self, params):
+        """ Push the specified profile on the stack """
+        self.client.run('%s/test/push-profile %s' %
+                        (self.client_cmd_flimflam_lib, params['name']))
+
+    def profile_pop(self, params):
+        """ Pop the specified profile from the stack or any profile
+            if no name is specified.
+        """
+        if 'name' in params:
+            self.client.run('%s/test/pop-profile %s' %
+                            (self.client_cmd_flimflam_lib, params['name']))
+        else:
+            self.client.run('%s/test/pop-profile' %
+                            (self.client_cmd_flimflam_lib))
+
 
     def __get_wifi_device_path(self):
         if self.client_wifi_device_path:
             return self.client_wifi_device_path
         ret = []
         result = self.client.run('%s/test/list-devices' %
                                  self.client_cmd_flimflam_lib)
         device_path = None
         for line in result.stdout.splitlines():
             m = re.match('\[\s*(\S*)\s*\]', line)
@@ skipping 263 matching lines @@
     except error.TestFail:
       if 'expect_failure' in testcase:
         self.expect_failure(name, testcase['expect_failure'])
       else:
         raise
     except Exception, e:
       if 'expect_failure' in testcase:
         self.expect_failure(name, testcase['expect_failure'])
       else:
         raise