From 2c6706bf497d892787f4c7478fe75187f9010303 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 3 Apr 2007 19:18:45 +0100 Subject: [PATCH] * Run sendmail -odi not -odq in adt-testreport-onepackage. * Longer timeouts by default. --- debian/changelog | 4 +++- runner/adt-run | 3 +-- runner/adt-testreport-onepackage | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 13b75b2..37f801c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,7 +14,9 @@ autopkgtest (0.7.2~~iwj) unstable; urgency=low * Default setting for adt_fw_allowglobalports is none. * Set DEBIAN_FRONTEND=noninteractive. * Run udevsettle after xm destroy but before dmsetup remove. - + * Run sendmail -odi not -odq in adt-testreport-onepackage. + * Longer timeouts by default. + -- autopkgtest (0.7.2) feisty; urgency=low diff --git a/runner/adt-run b/runner/adt-run index f743427..0f95ccd 100755 --- a/runner/adt-run +++ b/runner/adt-run @@ -45,7 +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 } +timeouts = { 'short':10, 'install':900, 'test':600, 'build':3000 } binaries = None # Binaries (.debs we have registered) build_essential = ["build-essential"] @@ -1422,7 +1422,6 @@ END what = 'apt-get-reinstall' cmdl = (b.apt_get() + ['--reinstall','install'] + [pkg for pkg in pkgs_reinstall]) - cmdl.append('env=DEBIAN_FRONTEND=noninteractive') rc = testbed.execute(what, cmdl, script=None, kind='install') if rc: badpkg("installation of basic binarries failed," " exit code %d" % rc) diff --git a/runner/adt-testreport-onepackage b/runner/adt-testreport-onepackage index d912fd7..9f1de64 100755 --- a/runner/adt-testreport-onepackage +++ b/runner/adt-testreport-onepackage @@ -358,7 +358,7 @@ else if $interactive; then cat "$tmp"/_email >&2 else - sendmail -odq -oem -t -oi <"$tmp"/_email + sendmail -odi -oem -t -oi <"$tmp"/_email fi fi -- 2.30.2