Merge lp:~doanac/phablet-tools/test-run-with-click into lp:phablet-tools

Proposed by Andy Doan
Status: Merged
Approved by: Ricardo Salveti
Approved revision: 212
Merged at revision: 212
Proposed branch: lp:~doanac/phablet-tools/test-run-with-click
Merge into: lp:phablet-tools
Diff against target: 19 lines (+3/-2)
1 file modified
phablet-test-run (+3/-2)
To merge this branch: bzr merge lp:~doanac/phablet-tools/test-run-with-click
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ricardo Salveti (community) Approve
Oliver Grawert Approve
Review via email: mp+192555@code.launchpad.net

Commit message

phablet-test-run doesn't support click-packages when -o used

When using the -o option, phablet-test-run fails to cd into the
/home/phablet/autopilot directory where click-tests live.

Description of the change

phablet-test-run doesn't support click-packages when -o used

When using the -o option, phablet-test-run fails to cd into the
/home/phablet/autopilot directory where click-tests live.

To post a comment you must log in.
Revision history for this message
Oliver Grawert (ogra) wrote :

looks good, i assume this has been tested ?

review: Approve
Revision history for this message
Andy Doan (doanac) wrote :

On 10/24/2013 12:53 PM, Oliver Grawert wrote:
> looks good, i assume this has been tested ?

yes, i've updated my copy of phablet-tools at home so i can get some
tests to start passing.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Ricardo Salveti (rsalveti) wrote :

Good, thanks.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'phablet-test-run'
2--- phablet-test-run 2013-09-25 14:39:02 +0000
3+++ phablet-test-run 2013-10-24 17:48:59 +0000
4@@ -91,12 +91,13 @@
5 # adb shell always returns 0, so we have to do some hackery to get the
6 # actual RC from the test
7 {
8+ apbase="sudo -iu $USER bash -ic \"cd /home/phablet/autopilot; autopilot run $VERBOSE"
9 if [ "$RESULTDIR" ]; then
10- adb shell "sudo -iu $USER bash -ic \"autopilot run $VERBOSE -o /tmp/test_results.xml -f xml $TESTSUITE\"; echo ADB_RC=\$?"
11+ adb shell "$apbase -o /tmp/test_results.xml -f xml $TESTSUITE\"; echo ADB_RC=\$?"
12 echo "***** Test summary *****"
13 exec_with_adb head -n 1 /tmp/test_results.xml
14 else
15- adb shell "sudo -iu $USER bash -ic \"cd /home/phablet/autopilot; autopilot run $VERBOSE $TESTSUITE\"; echo ADB_RC=\$?"
16+ adb shell "$apbase $TESTSUITE\"; echo ADB_RC=\$?"
17 fi
18 } | while read line; do
19 set +e

Subscribers

People subscribed via source and target branches