Merge lp:~doanac/ubuntu-test-cases/bug1284226 into lp:ubuntu-test-cases/touch

[Andy Doan]

moves test dependency installation out of provision.sh and into each test.

as a result, we now have 2 new results per test-suite (setup/teardown).

[Paul Larson (pwlars)]

+1

review: Approve

=== modified file 'scripts/combine_results'
--- scripts/combine_results	2013-10-24 18:17:03 +0000
+++ scripts/combine_results	2014-02-25 21:16:44 +0000
@@ -13,10 +13,25 @@
 from xml.etree import ElementTree
 
 
+PRE_COMBINE = [
+    ('settle_before', 'settle_before'),
+    ('setup_setup', 'setup'),
+]
+
+POST_COMBINE = [
+    ('settle_after', 'settle_after'),
+    ('setup_teardown', 'teardown'),
+]
+
+
 def _build_node(classname, name, rcfile, stdout):
     e = ElementTree.Element('testcase')
     e.attrib['classname'] = classname
-    e.attrib['name'] = 'settle_%s' % name
+    e.attrib['name'] = name
+
+    if not os.path.exists(rcfile):
+        return None, False
+
     rc = int(open(rcfile).read())
     if rc != 0:
         f = ElementTree.Element('failure')
@@ -60,26 +75,33 @@
     ap_file = os.path.join(resdir, 'test_results.xml')
     tree = _get_results(ap_file)
     ap_results = tree.getroot()
+    added_results = 0
 
     errors = int(ap_results.attrib['errors'])
 
     classname = _get_classname(ap_results)
 
-    rc = os.path.join(resdir, 'settle_before.rc')
-    log = os.path.join(resdir, 'settle_before.log')
-    node, failed = _build_node(classname, 'before', rc, log)
-    ap_results.insert(0, node)
-    if failed:
-        errors += 1
-
-    rc = os.path.join(resdir, 'settle_after.rc')
-    log = os.path.join(resdir, 'settle_after.log')
-    node, failed = _build_node(classname, 'after', rc, log)
-    ap_results.append(node)
-    if failed:
-        errors += 1
-
-    num = int(ap_results.attrib['tests']) + 2
+    for basename, label in PRE_COMBINE:
+        rc = os.path.join(resdir, basename + '.rc')
+        log = os.path.join(resdir, basename + '.log')
+        node, failed = _build_node(classname, label, rc, log)
+        if node is not None:
+            ap_results.insert(0, node)
+            if failed:
+                errors += 1
+            added_results += 1
+
+    for basename, label in POST_COMBINE:
+        rc = os.path.join(resdir, basename + '.rc')
+        log = os.path.join(resdir, basename + '.log')
+        node, failed = _build_node(classname, label, rc, log)
+        if node is not None:
+            ap_results.append(node)
+            if failed:
+                errors += 1
+            added_results += 1
+
+    num = int(ap_results.attrib['tests']) + added_results
     ap_results.attrib['tests'] = str(num)
     ap_results.attrib['errors'] = str(errors)
 

=== modified file 'scripts/dashboard.py'
--- scripts/dashboard.py	2014-02-05 00:44:09 +0000
+++ scripts/dashboard.py	2014-02-25 21:16:44 +0000
@@ -283,6 +283,9 @@
     try:
         val = args.func(api, args)
         if val:
+            if '/?' in val:
+                log.debug('stripping api-key from response')
+                val = val.split('/?')[0] + '/'
             print(val)
     except HTTPException as e:
         print('ERROR: %s' % e)

=== modified file 'scripts/provision.sh'
--- scripts/provision.sh	2014-02-10 17:14:14 +0000
+++ scripts/provision.sh	2014-02-25 21:16:44 +0000
@@ -125,7 +125,7 @@
 
 if [ -n "$CUSTOMIZE" ] ; then
 	log "CUSTOMIZING IMAGE"
-	phablet-config writable-image $CUSTOMIZE
+	phablet-config writable-image
         # Make sure whoopsie-upload-all can work (bug #1245524)
         adb shell "sed -i '/Waiting for whoopsie/ a\    subprocess.call([\"restart\", \"whoopsie\"])' /usr/share/apport/whoopsie-upload-all"
 fi

=== modified file 'scripts/run-autopilot-tests.sh'
--- scripts/run-autopilot-tests.sh	2014-02-05 00:44:09 +0000
+++ scripts/run-autopilot-tests.sh	2014-02-25 21:16:44 +0000
@@ -31,6 +31,21 @@
 	echo ERROR: $* >> ${RESDIR}/runner-errors.txt
 }
 
+setup_test() {
+	app=$1
+	label=$2
+	odir=$3
+	{
+		pkgs=$(${BASEDIR}/jenkins/testconfig.py packages -a $app)
+		if [ "$label" = "setup" ] ; then
+			adb-shell sudo apt-get install -yq --force-yes $pkgs
+		else
+			adb-shell sudo apt-get remove -y $pkgs
+		fi
+		echo $? > ${odir}/setup_${label}.rc
+	} 2>&1 | tee ${odir}/setup_${label}.log
+}
+
 system_settle() {
 	[ -z $NOSETTLE ] || return 0
 
@@ -48,10 +63,6 @@
 		timeout $timeout $settle -c5 -d6 -p 97.5 -l $label || rc=1
 		echo $rc > ${odir}/settle_${label}.rc
 	} 2>&1 | tee ${odir}/settle_${label}.log
-
-	if [ "$label" = "after" ] ; then
-		${BASEDIR}/scripts/combine_results ${odir}
-	fi
 }
 
 test_app() {
@@ -65,6 +76,8 @@
 	phablet-config autopilot --dbus-probe enable || \
 		(log_error "'autopilot dbus-probe enable' failed"; return 1)
 
+	setup_test $app setup $odir
+
 	NOSHELL=""
 	[ "$app" = "unity8" ] && NOSHELL="-n"
 
@@ -78,6 +91,8 @@
 		log_error "screen unlock failed, skipping $app"
 	fi
 	system_settle after $odir
+	setup_test $app teardown $odir
+	${BASEDIR}/scripts/combine_results ${odir}
 }
 
 reboot_wait() {