Merge lp:~mikemc/ubuntuone-control-panel/fix-1037904-run-tests into lp:ubuntuone-control-panel

[Mike McCracken]

- Remove use of env vars for u1lint and u1trial from old buildout. (LP: #1037904)

- Remove use of env vars for u1lint and u1trial from old buildout. (LP: #1037904)

[dobey (dobey)]

review: Approve

[Roberto Alsina (ralsina)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~mikemc/ubuntuone-control-panel/fix-1037904-run-tests into lp:ubuntuone-control-panel failed. Below is the output from the failed tests.

*** Running DBus test suite ***

./run-tests: line 68: --reactor=glib: command not found

[Manuel de la Peña (mandel)]

Finally!

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~mikemc/ubuntuone-control-panel/fix-1037904-run-tests into lp:ubuntuone-control-panel failed. Below is the output from the failed tests.

*** Running DBus test suite ***

./run-tests: line 68: --reactor=glib: command not found

[lp:~mikemc/ubuntuone-control-panel/fix-1037904-run-tests]

345. By Mike McCracken on 2012-08-20

Fixed braino, missed an instance of

=== modified file 'run-tests'
--- run-tests	2012-06-07 23:00:22 +0000
+++ run-tests	2012-08-20 18:51:09 +0000
@@ -32,7 +32,7 @@
 fi
 
 style_check() {
-    $u1lint --ignore ubuntuone/controlpanel/gui/qt/ui
+    u1lint --ignore ubuntuone/controlpanel/gui/qt/ui
     if [ -x `which pep8` ]; then
         pep8 --exclude '.svn,CVS,.bzr,.hg,.git,*_ui.py,*_rc.py' --repeat . bin/*
     else
@@ -52,8 +52,6 @@
 SYSNAME=`uname -s`
 
 if [ "$SYSNAME" == "Darwin" ]; then
-    u1trial="python $u1trial"
-    u1lint="python $u1lint"
     IGNORE_FILES="$WINDOWS_TESTS, $LINUX_TESTS"
     IGNORE_DBUS="-p $DBUS_TESTS_PATH"
     echo "*** Skipping DBus test suite ***"
@@ -64,21 +62,19 @@
     if [ "x$XVFB_CMDLINE" == "x" ]; then
 	echo "WARNING: Could not find xvfb-run, prepare for visual spam."
     fi
-    u1trial=u1trial
-    u1lint=u1lint
     IGNORE_FILES="$WINDOWS_TESTS, $DARWIN_TESTS"
     IGNORE_DBUS=""
     echo "*** Running DBus test suite ***"
-    $u1trial --reactor=glib "$DBUS_TESTS_PATH"
+    u1trial --reactor=glib "$DBUS_TESTS_PATH"
     REACTOR=gi
 fi
 
 echo "*** Running test suite for ""$MODULE"" ***"
-$u1trial --reactor=$REACTOR -p "$DBUS_TESTS_PATH, $QT_TESTS_PATH" -i "$IGNORE_FILES" "$MODULE"
+u1trial --reactor=$REACTOR -p "$DBUS_TESTS_PATH, $QT_TESTS_PATH" -i "$IGNORE_FILES" "$MODULE"
 
 echo "*** Running QT test suite for ""$MODULE"" ***"
 ./setup.py build
-$XVFB_CMDLINE $u1trial $IGNORE_DBUS -i "$IGNORE_FILES" --reactor=qt4 --gui "$MODULE"
+$XVFB_CMDLINE u1trial $IGNORE_DBUS -i "$IGNORE_FILES" --reactor=qt4 --gui "$MODULE"
 rm -rf _trial_temp
 rm -rf build