# adt-virt-xenlvm is part of autopkgtest
# autopkgtest is a tool for testing Debian binary packages
#
-# autopkgtest is Copyright (C) 2006 Canonical Ltd.
+# autopkgtest is Copyright (C) 2006-2007 Canonical Ltd.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
withholder.stdin.close()
withholder.stdout.close()
withholder = None
- bomb("with-testbed failed, code %d" % rc)
+ vsp.bomb("with-testbed failed, code %d" % rc)
if l != "y\n":
- bomb("with-testbed sh gave wrong output `%s', not `l'"
+ vsp.bomb("with-testbed sh gave wrong output `%s', not `l'"
% l.rstrip("\n"))
vsp.execute('mkdir %s' % downtmp, downp=True)
withholder.stdout.close()
rc = withholder.wait()
withholder = None
- if rc: bomb("with-testbed failed when closing/resetting, code %d" % rc)
+ if rc: vsp.bomb("with-testbed failed when closing/reverting,"
+ " code %d" % rc)
+
+def hook_forked_inchild():
+ if withholder is not None:
+ withholder.stdin.close()
+ withholder.stdout.close()
def hook_open():
hook_cleanup()
do_open()
return downtmp
-def hook_reset():
- check_pause('reset')
+def hook_revert():
+ check_pause('revert')
do_close()
do_open()
do_close()
def hook_capabilities():
- return ['revert','root-on-testbed','suggest-normal-user=adtxenu']
+ return ['revert','root-on-testbed','suggested-normal-user=adtxenu']
parse_args()
vsp.main()