def restore_resolv_conf(t):
'''restore the /etc/resolv.conf after testing is complete'''
if getattr(t, 'resolv_conf_backup', False):
+ t.info("restoring /etc/resolv.conf")
t.run_cmd("mv -f %s /etc/resolv.conf" % t.resolv_conf_backup)
def rndc_cmd(t, cmd, checkfail=True):
def test_cleanup(t):
'''cleanup after tests'''
+ t.info("Cleaning up ...")
restore_resolv_conf(t)
if getattr(t, 'bind_child', False):
t.bind_child.kill()
try:
test_howto(t)
- except Exception, str:
+ except:
if not opts.nocleanup:
test_cleanup(t)
raise