Merge lp:~mvo/software-center/adt-you-make-my-life-hard into lp:software-center

[Michael Vogt]

a sledgehammer approach to make the tests run as user

[Gary Lasker (gary-lasker)]

Interesting!

review: Approve

=== modified file 'debian/tests/run-tests'
--- debian/tests/run-tests	2012-08-28 13:01:46 +0000
+++ debian/tests/run-tests	2012-08-30 16:13:20 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-set -e 
+set -ex
 
 # the default user in the adt env is "ubuntu"
 USER=ubuntu
@@ -9,6 +9,10 @@
 # we don't like running as root in the adt environment
 if $(id $USER >/dev/null); then
     if [ "$(id -u)" = "0" ]; then
+        # the ADT basedir is 0700 so non-root have a hard time
+        ADT_BASEDIR=$PWD/..
+        echo "FIXING owner in ${ADT_BASEDIR} to user $USER"
+        chown -R $USER ${ADT_BASEDIR}
         echo "Switching to user $USER"
         su -lc "cd $PWD; sh $0" $USER
     fi

=== modified file 'run-tests.sh'
--- run-tests.sh	2012-08-28 13:17:24 +0000
+++ run-tests.sh	2012-08-30 16:13:20 +0000
@@ -91,7 +91,7 @@
     done
 }
 
-if [ "$1" == "--sso-gtk" ]; then
+if [ "$1" = "--sso-gtk" ]; then
     # Run the SSO GTK+ suite
     $PYTHON discover -s softwarecenter/sso/
 elif [ $# -gt 0 ]; then