* set some default timeouts (these should be settable with options,

[autopkgtest.git] / runner / adt-run

diff --git a/runner/adt-run b/runner/adt-run
index 8873757bb00bbf3336b50896b11bb2761dd9a384..3521af3c39cca2aa324a8abbf9fd398414e14f62 100755 (executable)
--- a/runner/adt-run
+++ b/runner/adt-run
@@ -45,6 +45,7 @@ signal.signal(signal.SIGINT, signal.SIG_DFL) # undo stupid Python SIGINT thing
 tmpdir = None          # pathstring on host
 testbed = None         # Testbed
 errorcode = 0          # exit status that we are going to use
+timeouts = { 'short':10, 'install':300, 'test':300, 'build':3000 }
 binaries = None                # Binaries (.debs we have registered)
 build_essential = ["build-essential"]
 
@@ -447,6 +448,15 @@ def parse_args():
               help='use binary package DEB according'
                    ' to most recent --binaries-* settings')
 
+       def cb_actnoarg(op,optstr,value,parser, largsentry):
+               parser.largs.append(largsentry)
+       pa('','--instantiate', action='callback', callback=cb_actnoarg,
+               callback_args=((None, ('instantiate',)),),
+               help='instantiate testbed now (during testing phase)'
+                    ' and install packages'
+                    ' selected for automatic installation, even'
+                    ' if this might apparently not be required otherwise')
+
        pa_action('override-control',   'CONTROL', ('control',), is_act=0,
               help='run tests from control file CONTROL instead,'
                    ' (applies to next test suite only)')
@@ -608,7 +618,8 @@ def parse_args():
                if kind == 'dsc': fwhatx = '/' + os.path.basename(pathstr)
                else: fwhatx = '-'+kind
 
-               af = constructor(what+fwhatx, pathstr, arghandling['tb'])
+               if pathstr is None: af = None
+               else: af = constructor(what+fwhatx, pathstr, arghandling['tb'])
                opts.actions.append(Action(kind, af, arghandling, what))
 
 def setup_trace():
@@ -727,7 +738,7 @@ class Testbed:
        if not tb._need_reset_apt: return
        what = 'aptget-update-reset'
        cmdl = ['apt-get','-qy','update']
-       rc = tb.execute(what, cmdl)
+       rc = tb.execute(what, cmdl, timeout=timeouts['install'])
        if rc:
                pstderr("\n" "warning: failed to restore"
                        " testbed apt cache, exit code %d" % rc)
@@ -771,7 +782,8 @@ class Testbed:
                ]])
        cmdl = ['python','-c',script]
        what = 'install-deps'
-       rc = testbed.execute(what+'-debinstall', cmdl, script=script)
+       rc = testbed.execute(what+'-debinstall', cmdl, script=script,
+                               timeout=timeouts['install'])
        if rc: badpkg('dependency install failed, exit code %d' % rc)
  def needs_reset(tb):
        tb._debug('needs_reset, previously=%s' % tb.modified, 1)
@@ -838,7 +850,7 @@ class Testbed:
        return rl[0]
  def execute(tb, what, cmdl,
                si='/dev/null', so='/dev/null', se=None, cwd=None,
-               script=False, tmpdir=None):
+               script=False, tmpdir=None, timeout=timeouts['short']):
        # Options for script:
        #   False - do not call debug_subprocess, no synch. reporting required
        #   None or string - call debug_subprocess with that value,
@@ -867,6 +879,9 @@ class Testbed:
                ','.join(map(urllib.quote, cmdl)),
                si, so, se_use, cwd]
 
+       if timeout is not None and timeout > 0:
+               cmdl.append('timeout=%d' % timeout)
+
        if xdump is not None and 'execute-debug' in tb.caps: cmdl += [xdump]
        if tmpdir is not None: cmdl.append('env=TMPDIR=%s' % tmpdir)
 
@@ -1058,7 +1073,7 @@ class Test:
 
        rc = testbed.execute('test-'+t.what, tfl,
                so=so.write(True), se=se.write(True), cwd=tree.read(True),
-               tmpdir=tmpdir)
+               tmpdir=tmpdir, timeout=timeouts['test'])
 
        so_read = so.read()
        se_read = se.read()
@@ -1404,7 +1419,8 @@ END
                what = 'apt-get-reinstall'
                cmdl = (b.apt_get() + ['--reinstall','install'] +
                        [pkg for pkg in pkgs_reinstall])
-               rc = testbed.execute(what, cmdl, script=None)
+               rc = testbed.execute(what, cmdl, script=None,
+                               timeout=timeouts['install'])
                if rc: badpkg("installation of basic binarries failed,"
                                " exit code %d" % rc)
 
@@ -1413,7 +1429,8 @@ END
                what = 'apt-get-install-%s' % pkg
                testbed.blame(pkg)
                cmdl = b.apt_get() + ['install',pkg]
-               rc = testbed.execute(what, cmdl, script=None)
+               rc = testbed.execute(what, cmdl, script=None,
+                               timeout=timeouts['install'])
                if rc: badpkg("installation of %s failed, exit code %d"
                                % (pkg, rc))
 
@@ -1429,7 +1446,8 @@ def source_rules_command(act,script,what,which,work,cwd,
        so = TemporaryFile('%s-%s-results' % (what,which))
        rc = testbed.execute('%s-%s' % (what,which),
                        ['sh','-ec',script]+xargs, script=script,
-                       so=so.write(True), cwd=cwd)
+                       so=so.write(True), cwd=cwd,
+                       timeout=timeouts['build'])
        results = open(so.read()).read().rstrip('\n')
        if len(results): results = results.split("\n")
        else: results = []
@@ -1499,7 +1517,8 @@ def build_source(act, control_override):
                        ]])
                cmdl = ['python','-c',script]
                whatp = what+'-dpkgsource'
-               rc = testbed.execute(what, cmdl, script=script)
+               rc = testbed.execute(what, cmdl, script=script,
+                               timeout=timeouts['install'])
                if rc: badpkg('dpkg-source install failed, exit code %d' % rc)
 
        work = TemporaryDir(what+'-build')
@@ -1610,7 +1629,8 @@ def build_source(act, control_override):
 
                cmdl = ['python','-c',script]
                whatp = what+'-builddeps'
-               rc = testbed.execute(what, cmdl, script=script)
+               rc = testbed.execute(what, cmdl, script=script,
+                               timeout=timeouts['install'])
                if rc: badpkg('build-depends install failed,'
                              ' exit code %d' % rc)
 
@@ -1690,7 +1710,7 @@ def process_actions():
        binaries = Binaries()
 
        for act in opts.actions:
-               if not act.af.spec_tbp:
+               if act.af is not None and not act.af.spec_tbp:
                        testbed.register_ephemeral(act.af)
 
        binaries.reset()
@@ -1715,6 +1735,8 @@ def process_actions():
                        act.binaries = []
                if act.kind.endswith('tree') or act.kind == 'dsc':
                        control_override = None
+               if act.kind == 'instantiate':
+                       pass
 
        debug_a1('builds done.')
 
@@ -1750,6 +1772,8 @@ def process_actions():
                        debug_a3('run_tests ...')
                        run_tests(stanzas, act.af)
                        control_override = None
+               if act.kind == 'instantiate':
+                       testbed.prepare([])
        debug_a1('tests done.')
 
 def main():