* Run sendmail -odi not -odq in adt-testreport-onepackage.

* Longer timeouts by default.

diff --git a/debian/changelog b/debian/changelog
index 13b75b2adbb77c58b375081fb4e996c793f17c8c..37f801cdcea082bca9a840b2df5b970aaf90724a 100644 (file)
--- 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 f743427107a9f465351472c350bf47f83090762b..0f95ccd86e3727d897baba36e2db4de9c88a414e 100755 (executable)
--- 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 d912fd74e5066d57547bc897a4efd91b3995f0bc..9f1de64290f86f6a7fbc743eb2133d7d28406a7f 100755 (executable)
--- 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