Merge lp:~fginther/phablet-tools/fix-ptr-python3-import-check into lp:phablet-tools

[Francis Ginther]

phablet-test-run: check the return code when attempting to import tests with python3 instead of just looking for text output. Log messages generated on import will cause the import check to fail when it should not.

In phablet-test-run, check the return code when attempting to import tests with python3 instead of just looking for text output. Log messages generated on import will cause the import check to fail when it should not.

This was tested with the following:
 - mediaplayer_app (installed from mediaplayer-app-autopilot)
   This falls back to python 2.
 - calendar_app (installed via phablet-click-test-setup)
   This uses python 3.
 - address_book_app (installed from the packages used by https://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1149)
   This uses python 3 with this fix (w/o this fix it incorrectly uses python 2)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:282
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/340/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-armhf-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-utopic-i386-ci/21

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-tools-ci/340/rebuild

review: Approve (continuous-integration)

[Dimitri John Ledkov (xnox)]

review: Approve

=== modified file 'phablet-test-run'
--- phablet-test-run	2014-05-14 13:05:18 +0000
+++ phablet-test-run	2014-06-06 18:05:17 +0000
@@ -120,8 +120,12 @@
 
     # First let's try python3, without python2 path
     defaultpy="/usr/bin/python3"
-    import_error=$(adb shell "cd /home/phablet/autopilot; $defaultpy -c 'import $TESTSUITE'")
-    if [ -n "$import_error" ]; then
+    # adb shell always returns 0, so we have to do some hackery to get the
+    # actual RC from the test
+    import_error=$(adb shell "cd /home/phablet/autopilot; $defaultpy -c 'import $TESTSUITE'; echo ADB_RC=\$?")
+    echo $import_error | get_returncode
+    import_rc=$?
+    if [ "$import_rc" -ne 0 ]; then
 	defaultpy="PYTHONPATH=/home/phablet/autopilot/legacy-py2:/home/phablet/autopilot /usr/bin/python"
     fi