From: Ian Jackson <ian@liberator>
Date: Mon, 16 Jul 2007 14:20:25 +0000 (+0100)
Subject: WIP better reporting for DC-running
X-Git-Tag: converted-from-bzr~45^2~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=3e180b715885421d6cabf944a7fc815cdfa725cd;p=autopkgtest.git

WIP better reporting for DC-running
---

diff --git a/debian/changelog b/debian/changelog
index cb9865f..d85ced1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+autopkgtest (1.0.3) unstable; urgency=low
+
+  * WIP better reporting for DC-running
+
+ --
+
 autopkgtest (1.0.2) unstable; urgency=low
 
   * xenlvm command-line settings properly override config file
diff --git a/runner/adt-run b/runner/adt-run
index 2552988..1274da8 100755
--- a/runner/adt-run
+++ b/runner/adt-run
@@ -188,7 +188,9 @@ def mkdir_okexist(pathname, mode=02755):
 
 def rmtree(what, pathname):
 	debug('/ %s rmtree %s' % (what, pathname), 2)
-	shutil.rmtree(pathname)
+	try: shutil.rmtree(pathname)
+	except (IOError,OSError), oe:
+		if oe.errno != errno.EEXIST: raise
 
 def debug_subprocess(what, cmdl=None, script=None):
 	o = '$ '+what+':'
@@ -891,6 +893,7 @@ class Testbed:
 	if xdump is not None and 'execute-debug' in tb.caps: cmdl += [xdump]
 	if tmpdir is not None: cmdl.append('env=TMPDIR=%s' % tmpdir)
 	if kind=='install': cmdl.append('env=DEBIAN_FRONTEND=noninteractive')
+#	cmdl.append('env=LANG=C')
 
 	rc = tb.commandr1('execute', cmdl)
 	try: rc = int(rc)
diff --git a/runner/adt-testreport-onepackage b/runner/adt-testreport-onepackage
index 9b4d83c..122abfb 100755
--- a/runner/adt-testreport-onepackage
+++ b/runner/adt-testreport-onepackage
@@ -235,6 +235,7 @@ printf >&3 "%s " $rc
 
 ourx=0
 upload=true
+: ${upload_if_notests:=false}
 extras=''
 
 case "$rc" in
@@ -243,7 +244,7 @@ case "$rc" in
 2)	summary='OK (some skipped)';		email=''
 					upload=$upload_if_ok		;;
 8)	summary='package declares no tests';	email=''
-					upload=false; extras='nt'	;;
+				upload=$upload_if_notests; extras='nt'	;;
 4|6)	summary='test(s) failed!';	email="$maintainer_email"	;;
 12)	summary='erroneous package!';	email="$maintainer_email"	;;
 16)	summary='testbed failed!';	email="administrator_email"	;;
@@ -254,6 +255,7 @@ progress "RESULTS $summary"
 
 if $upload; then
 	progress "bundling"
+	printf "\n%s\n" "$summary" >>"$tmp"/_summary
 	ln "$tmp"/_summary "$tp"/summary
 
 	for odir in tmp out; do