Be lenient if deconfig fails to find a bridge

server/site_linux_router.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 logging, re, time
 from autotest_lib.client.common_lib import error
 from autotest_lib.server import site_eap_tls
 
 def isLinuxRouter(router):
     router_uname = router.run('uname').stdout
@@ skipping 301 matching lines @@
 #        self.router.run("rm -f %s" % self.hostapd['file'])
 
         # Try a couple times to remove the bridge; hostapd may still be exiting
         for attempt in range(3):
             self.router.run("%s link set %s down" %
                             (self.cmd_ip, self.bridgeif), ignore_status=True)
 
             result = self.router.run("%s delbr %s" %
                                      (self.cmd_brctl, self.bridgeif),
                                      ignore_status=True)
-            if not result.stderr:
+            if not result.stderr or 'No such device' in result.stderr:
                 break
             time.sleep(1)
         else:
             raise error.TestFail("Unable to delete bridge %s: %s" %
                                  (self.bridgeif, result.stderr))
 
 
         self.hostapd['configured'] = False
 
 
     def get_ssid(self):
         return self.hostapd['conf']['ssid']