* adt-xenlvm-with-testbed: sleep 1 after xm destroy, which is racy.

[autopkgtest.git] / virt-subproc / adt-virt-xenlvm

diff --git a/virt-subproc/adt-virt-xenlvm b/virt-subproc/adt-virt-xenlvm
index a4a1ec5032d1d38780d0b53b0ee6bdad1d8e38ee..08608daba9ad6d6f321bb33b5b1f63dab365ecc3 100755 (executable)
--- a/virt-subproc/adt-virt-xenlvm
+++ b/virt-subproc/adt-virt-xenlvm
@@ -3,7 +3,7 @@
 # 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
@@ -57,32 +57,61 @@ def check_pause(kind):
        os.kill(0, signal.SIGSTOP)
 
 def parse_args():
-       global debuglevel, xlargs, gain_root, console, pauses
+       global debuglevel, with_testbed, console, pauses
 
        usage = "%prog <options> [-- <adt-xenlvm options>]"
        parser = OptionParser(usage=usage)
        pa = parser.add_option
        pe = parser.error
 
-       pa('-r', '--gain-root', type='string', dest='gain_root');
-       pa('-d', '--debug', action='store_true', dest='debug');
-       pa('','--pause', type='string', dest='pause', default='');
+       pa('-r', '--gain-root', type='string', dest='gain_root')
+       pa('-d', '--debug', action='store_true', dest='debug')
+       pa('', '--userv', action='store_true', dest='userv')
+       pa('', '--distro', type='string', dest='distro')
+       pa('', '--nominum', type='string', dest='nominum')
+       pa('','--pause', type='string', dest='pause', default='')
 
        (opts,xlargs) = parser.parse_args()
        vsp.debuglevel = opts.debug
-
-       if opts.gain_root is None: gain_root = []
-       else: gain_root = opts.gain_root.split()
-       vsp.down = gain_root + ['adt-xenlvm-on-testbed'] + xlargs + ['--']
-
+       xargs_userv = []
+       xargs_direct = []
+
+       for k in ['distro','nominum']:
+               v = getattr(opts,k)
+               if v is None: continue
+               xargs_direct.append('--%s=%s' % (k, v))
+               xargs_userv.append('-D%s=%s' % (k, v))
+
+       if not opts.userv:
+               if opts.gain_root is None: gain_root = []
+               else: gain_root = opts.gain_root.split()
+               with_testbed = (gain_root + ['adt-xenlvm-with-testbed'] +
+                       xargs_direct + xlargs +
+                       ['--','sh','-ec','echo y; exec cat'])
+               vsp.down = (gain_root + ['adt-xenlvm-on-testbed'] +
+                       xargs_direct + xlargs + ['--'])
+       else:
+               if opts.gain_root:
+                       pe('--userv and --gain-root are not compatible')
+               basis = (['userv'] + xargs_userv + xlargs +
+                       ['root','adt-xenlvm-testbed'])
+               with_testbed = basis + ['with']
+               get_down = subprocess.Popen(basis + ['pon0'],
+                       stdin=file('/dev/null'), stdout=subprocess.PIPE,
+                       stderr=None)
+               (pon0, _) = get_down.communicate()
+               if get_down.returncode:
+                       vsp.bomb('failed to check userv service provision'
+                               ' and subcommand details (code=%d)' %
+                               get_down.returncode)
+               vsp.down = pon0.split('\0')
        pauses = opts.pause.split(',')
 
 def do_open():
        global withholder
        assert(withholder is None)
        withholder = subprocess.Popen(
-               gain_root + ['adt-xenlvm-with-testbed'] + xlargs +
-                ['--','sh','-ec','echo y; exec cat'],
+               with_testbed,
                stdin=subprocess.PIPE, stdout=subprocess.PIPE )
        l = withholder.stdout.readline(2)
        rc = withholder.poll()
@@ -90,9 +119,9 @@ def do_open():
                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)   
 
@@ -103,7 +132,8 @@ def do_close():
        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:
@@ -115,8 +145,8 @@ def hook_open():
        do_open()
        return downtmp
 
-def hook_reset():
-       check_pause('reset')
+def hook_revert():
+       check_pause('revert')
        do_close()
        do_open()
 
@@ -127,7 +157,7 @@ def hook_cleanup():
                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()