Ubuntu One Control Panel

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

  1. fix-1037904-run-tests
  2. Merge into trunk
Proposed by Mike McCracken on 2012-08-17
Status: Merged
Approved by: Mike McCracken on 2012-08-20
Approved revision: 345
Merged at revision: 345
Proposed branch: lp:~mikemc/ubuntuone-control-panel/fix-1037904-run-tests
Merge into: lp:ubuntuone-control-panel
Diff against target: 45 lines (+4/-8)
1 file modified
run-tests (+4/-8)
To merge this branch: bzr merge lp:~mikemc/ubuntuone-control-panel/fix-1037904-run-tests
Reviewer Review Type Date Requested Status
Manuel de la Peña (community) Approve on 2012-08-20
Roberto Alsina (community) Approve on 2012-08-20
dobey (community) 2012-08-17 Approve on 2012-08-17
Review via email: mp+120057@code.launchpad.net

Commit Message

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

Description of the Change

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

To post a comment you must log in.
dobey (dobey) :
review: Approve
Roberto Alsina (ralsina) :
review: Approve
Ubuntu One Auto Pilot (otto-pilot) wrote :

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) wrote :

Finally!

review: Approve
Ubuntu One Auto Pilot (otto-pilot) wrote :

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 updated on 2012-08-20
345. By Mike McCracken on 2012-08-20

Fixed braino, missed an instance of

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'run-tests'
2--- run-tests 2012-06-07 23:00:22 +0000
3+++ run-tests 2012-08-20 18:51:09 +0000
4@@ -32,7 +32,7 @@
5 fi
6
7 style_check() {
8- $u1lint --ignore ubuntuone/controlpanel/gui/qt/ui
9+ u1lint --ignore ubuntuone/controlpanel/gui/qt/ui
10 if [ -x `which pep8` ]; then
11 pep8 --exclude '.svn,CVS,.bzr,.hg,.git,*_ui.py,*_rc.py' --repeat . bin/*
12 else
13@@ -52,8 +52,6 @@
14 SYSNAME=`uname -s`
15
16 if [ "$SYSNAME" == "Darwin" ]; then
17- u1trial="python $u1trial"
18- u1lint="python $u1lint"
19 IGNORE_FILES="$WINDOWS_TESTS, $LINUX_TESTS"
20 IGNORE_DBUS="-p $DBUS_TESTS_PATH"
21 echo "*** Skipping DBus test suite ***"
22@@ -64,21 +62,19 @@
23 if [ "x$XVFB_CMDLINE" == "x" ]; then
24 echo "WARNING: Could not find xvfb-run, prepare for visual spam."
25 fi
26- u1trial=u1trial
27- u1lint=u1lint
28 IGNORE_FILES="$WINDOWS_TESTS, $DARWIN_TESTS"
29 IGNORE_DBUS=""
30 echo "*** Running DBus test suite ***"
31- $u1trial --reactor=glib "$DBUS_TESTS_PATH"
32+ u1trial --reactor=glib "$DBUS_TESTS_PATH"
33 REACTOR=gi
34 fi
35
36 echo "*** Running test suite for ""$MODULE"" ***"
37-$u1trial --reactor=$REACTOR -p "$DBUS_TESTS_PATH, $QT_TESTS_PATH" -i "$IGNORE_FILES" "$MODULE"
38+u1trial --reactor=$REACTOR -p "$DBUS_TESTS_PATH, $QT_TESTS_PATH" -i "$IGNORE_FILES" "$MODULE"
39
40 echo "*** Running QT test suite for ""$MODULE"" ***"
41 ./setup.py build
42-$XVFB_CMDLINE $u1trial $IGNORE_DBUS -i "$IGNORE_FILES" --reactor=qt4 --gui "$MODULE"
43+$XVFB_CMDLINE u1trial $IGNORE_DBUS -i "$IGNORE_FILES" --reactor=qt4 --gui "$MODULE"
44 rm -rf _trial_temp
45 rm -rf build
46

Subscribers

People subscribed via source and target branches