Merge lp:~xnox/phablet-tools/py2-3 into lp:phablet-tools

[Dimitri John Ledkov]

Support python2 and python3 based autopilot tests.

Support python2 and python3 based autopilot tests.

[lp:~xnox/phablet-tools/py2-3]

241. By Dimitri John Ledkov on 2014-02-10

correct pythonpath

[Dimitri John Ledkov (xnox)]

/home/autopilot/ can have python3 modules, or python3 & 2 bilingual modules (e.g. uitoolkit, unity8 emulators etc. are expected to be bilingual)

/home/autopilot/legacy-py2 can only have python2 modules.

I've modified get_bzr_tests to fetch into python2 location is autopilot_dir is not defined.
If autopilot_dir is defined, it's fetched into python3 location.

Ditto grabbing tests from binary packages, although that doesn't grab python3 tests yet.

The phablet-test-run portion, modifies how autopilot is launched to carefully set PYTHONPATH for python2-only (this is achieved by passing -E (ignore pythonpath) to python3, which is dropped if autopilot re-execs under python2)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:241
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/272/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-amd64-ci/44
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-armhf-ci/44
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-i386-ci/44

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

review: Approve (continuous-integration)

[Dimitri John Ledkov (xnox)]

This branch should land ahead of https://code.launchpad.net/~barry/autopilot/reexec/+merge/203765 landing, such that phablet-test-run is prepared to handle the switch.

[Sergio Schvezov (sergiusens)]

@balloons can you make the rule xnox mentions something true for the core apps? Or provide a list of py3 ready clicks.

[Sergio Schvezov (sergiusens)]

60 + entry['x-source']['autopilot-dir'],

the autopilot extension I talked about was not part of x-source but part of a new node at the same lever of x-source called

"x-test": {
    "autopilot": "ubuntu_calendar_app"
}

so we can eventually just run the tests for a given package, whatever those tests are; if you want to change anything, we can; adding the autopilot-dir to x-source seems reasonable to me as well.

review: Needs Information

[Andy Doan (doanac)]

I noticed this requires "fromdos" which isn't installed by default for me

review: Needs Fixing

[lp:~xnox/phablet-tools/py2-3]

242. By Dimitri John Ledkov on 2014-02-20

Add fromdos dependency.

243. By Dimitri John Ledkov on 2014-02-20

Correct click manifest key

[Dimitri John Ledkov (xnox)]

Addressed all review comments.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:243
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/278/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-amd64-ci/50
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-armhf-ci/50
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-i386-ci/50

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

review: Approve (continuous-integration)

[Sergio Schvezov (sergiusens)]

69 + if entry['x-test'] and 'autopilot' in entry['x-test']:
70 + get_bzr_tests(entry['x-source']['vcs-bzr'],
71 + entry['x-source']['vcs-bzr-revno'],
72 + entry['x-test']['autopilot'],
73 + test_dir)

So here it would be called like:
def get_bzr_tests(branch=entry['x-source']['vcs-bzr'],
                  revision=entry['x-source']['vcs-bzr-revno'],
                  autopilot_dir=entry['x-test']['autopilot'],
                  target_dir=test_dir,
                  sub_dir=None
                  )

74 + else:
75 + get_bzr_tests(entry['x-source']['vcs-bzr'],
76 + entry['x-source']['vcs-bzr-revno'],
77 + 'tests/autopilot',
78 + test_dir,
79 + py2_subdir)

and here
def get_bzr_tests(branch=entry['x-source']['vcs-bzr'],
                  revision=entry['x-source']['vcs-bzr-revno'],
                  autopilot_dir='tests/autopilot',
                  target_dir=test_dir,
                  sub_dir=py2_subdir
                  )

Seems that in
47 +def get_bzr_tests(branch, revision, autopilot_dir, target_dir, sub_dir):

sub_dir needs a None or '' default

Second
test_dir='ubuntu_clock_app' for when autopilot_dir=entry['x-test']['autopilot'] exists
and
test_dir='tests/autopilot' when not.

I would just keep 'tests/autopilot' for both or add some prior check that applies to both to look for '[x-source']['autopilot-dir'] as you had or default to 'tests/autopilot'

review: Needs Fixing

[lp:~xnox/phablet-tools/py2-3]

244. By Dimitri John Ledkov on 2014-02-20

Simplify get_bzr_tests call.

245. By Dimitri John Ledkov on 2014-02-20

pep8

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:245
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/280/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-amd64-ci/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-armhf-ci/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-i386-ci/52

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:245
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/281/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-amd64-ci/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-armhf-ci/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-i386-ci/53

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

review: Approve (continuous-integration)

[lp:~xnox/phablet-tools/py2-3]

246. By Dimitri John Ledkov on 2014-02-21

Pick correct python ahead of execution

247. By Dimitri John Ledkov on 2014-02-21

Drop bogus depends

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~xnox/phablet-tools/py2-3]

248. By Dimitri John Ledkov on 2014-02-24

Add python3 modules

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:248
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/283/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-amd64-ci/55
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-armhf-ci/55
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-i386-ci/55

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:248
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/284/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-amd64-ci/56
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-armhf-ci/56
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-trusty-i386-ci/56

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

review: Approve (continuous-integration)

[Sergio Schvezov (sergiusens)]

review: Approve

[Andy Doan (doanac)]

review: Approve

[Martin Pitt (pitti)]

Very nice, thanks Dimitri!

review: Approve

[lp:~xnox/phablet-tools/py2-3]

249. By Dimitri John Ledkov on 2014-03-06

Merge trunk

[Dimitri John Ledkov (xnox)]

With following two packages:
com.ubuntu.calendar 205 or better
com.ubuntu.music 370 or better

We can land this branch without regressing any test-results, and since unity8/ubuntu-ui-toolkit have landed with python3 support, we can test this branch as per test-plan out of silo against unmodified images.

Please allocate a silo / start landing this branch.

=== modified file 'phablet-click-test-setup'
--- phablet-click-test-setup	2013-10-21 18:14:51 +0000
+++ phablet-click-test-setup	2014-03-06 13:08:36 +0000
@@ -58,13 +58,15 @@
 
 lp = None
 
+py2_subdir = 'legacy-py2'
+
 basic_packages = (
     {'source': 'unity8', 'binary': 'unity8'},
     {'source': 'ubuntu-ui-toolkit',
      'binary': 'qtdeclarative5-ubuntu-ui-toolkit-plugin'})
 
 python_packages = (
-    'python-mock', 'python-dateutil'
+    'python-mock', 'python-dateutil', 'python3-dateutil'
     )
 
 
@@ -111,6 +113,7 @@
 def get_python_binary_package(package, target_dir):
     tmp_dir = tempfile.mkdtemp()
     atexit.register(cleanup, tmp_dir)
+    python2_target_dir = os.path.join(target_dir, py2_subdir)
     print('Fetching %s - into %s' % (package, tmp_dir))
     bpph = lp.archive.getPublishedBinaries(
         binary_name=package,
@@ -134,12 +137,22 @@
                                   'usr/lib/python2.7/dist-packages')
     python_modules_dir = pyshared_path if os.path.exists(pyshared_path) \
         else python2_7_path
-    for f in os.listdir(python_modules_dir):
-        source = path.join(python_modules_dir, f)
-        if path.islink(source):
-            source = path.join(python_modules_dir, os.readlink(source))
-        print('Moving %s to %s' % (source, target_dir))
-        shutil.move(source, target_dir)
+    if os.path.exists(python_modules_dir):
+        for f in os.listdir(python_modules_dir):
+            source = path.join(python_modules_dir, f)
+            if path.islink(source):
+                source = path.join(python_modules_dir, os.readlink(source))
+            print('Moving %s to %s' % (source, python2_target_dir))
+            shutil.move(source, python2_target_dir)
+    python3_modules_dir = os.path.join(extract_dir,
+                                       'usr/lib/python3/dist-packages')
+    if os.path.exists(python3_modules_dir):
+        for f in os.listdir(python3_modules_dir):
+            source = path.join(python3_modules_dir, f)
+            if path.islink(source):
+                source = path.join(python3_modules_dir, os.readlink(source))
+            print('Moving %s to %s' % (source, target_dir))
+            shutil.move(source, target_dir)
 
 
 def get_source_package_tests(package, version, target_dir):
@@ -163,15 +176,17 @@
         shutil.move(test_dir, target_dir)
 
 
-def get_bzr_tests(branch, revision, target_dir):
+def get_bzr_tests(branch, revision, autopilot_dir, target_dir, sub_dir):
     tmp_dir = tempfile.mkdtemp()
     atexit.register(cleanup, tmp_dir)
     print('Checking out %s to %s' % (branch, path.join(tmp_dir, 'work')))
     check_call(['bzr', 'checkout', '--lightweight', branch, '-r', revision,
                'work'], cwd=tmp_dir)
-    test_base_dir = path.join(tmp_dir, 'work', 'tests', 'autopilot')
+    test_base_dir = path.join(tmp_dir, 'work', autopilot_dir)
     test_dirs = filter((lambda x: path.isdir(path.join(test_base_dir, x))),
                        os.listdir(test_base_dir))
+    if sub_dir:
+        target_dir = os.path.join(target_dir, sub_dir)
     for test_dir in test_dirs:
         test_dir = path.join(test_base_dir, test_dir)
         print('Moving %s to %s' % (test_dir, target_dir))
@@ -194,9 +209,14 @@
     print('Only keeping entries with x-source')
     manifest = [entry for entry in manifest if 'x-source' in entry]
     for entry in manifest:
+        subdir = py2_subdir
+        if 'x-test' in entry and 'autopilot' in entry['x-test']:
+            subdir = None
         get_bzr_tests(entry['x-source']['vcs-bzr'],
                       entry['x-source']['vcs-bzr-revno'],
-                      test_dir)
+                      'tests/autopilot',
+                      test_dir,
+                      subdir)
 
 
 def main():
@@ -208,6 +228,7 @@
     series = adb.shell('lsb_release -c -s').strip()
     lp = LP(series, arch)
     test_dir = tempfile.mkdtemp()
+    os.mkdir(os.path.join(test_dir, py2_subdir))
     atexit.register(cleanup, test_dir)
     fetch_test_base(adb, test_dir)
     fetch_click_tests(adb, test_dir, args.user, args.click)

=== modified file 'phablet-test-run'
--- phablet-test-run	2014-01-20 19:59:53 +0000
+++ phablet-test-run	2014-03-06 13:08:36 +0000
@@ -100,10 +100,18 @@
 
 run_autopilot_test() {
     exec_with_adb chmod 666 /dev/uinput
+
+    # 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
+	defaultpy="PYTHONPATH=/home/phablet/autopilot/legacy-py2:/home/phablet/autopilot /usr/bin/python"
+    fi
+
     # adb shell always returns 0, so we have to do some hackery to get the
     # actual RC from the test
     {
-        apbase="sudo -iu $USER bash -ic \"cd /home/phablet/autopilot; autopilot run $VERBOSE"
+        apbase="sudo -iu $USER bash -ic \"cd /home/phablet/autopilot; $defaultpy -m autopilot.run run $VERBOSE"
         if [ "$RESULTDIR" ]; then
             adb shell "$apbase -o /tmp/test_results.xml -f xml $TESTSUITE\"; echo ADB_RC=\$?"
             echo "***** Test summary *****"