Merge lp:~doanac/phablet-tools/click-x86 into lp:phablet-tools

[Andy Doan]

support click setup on x86 emulator

We have different packaging names for x86 emulator. This adds
the ability to do an arch specific package lookup.

Fixes phablet-click-test-setup when targeting the x86 emulator

[lp:~doanac/phablet-tools/click-x86]

272. By Andy Doan on 2014-05-13

support click setup on x86 emulator

We have different packaging names for x86 emulator. This adds
the ability to do an arch specific package lookup.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Sergio Schvezov (sergiusens)]

How about using 'adb shell dpkg --print-architecture's result as another key entry to lookup in the map? Just in case we add some other arch sooner than later

review: Needs Information

[Sergio Schvezov (sergiusens)]

or maybe just do a 'binary': () tuple or [] and iterate over it until one is found

[Andy Doan (doanac)]

On 05/14/2014 09:39 AM, Sergio Schvezov wrote:
> How about using 'adb shell dpkg --print-architecture's result as another key entry to lookup in the map? Just in case we add some other arch sooner than later

can you elaborate? I'm not sure I understand what you are saying here.

[Sergio Schvezov (sergiusens)]

> On 05/14/2014 09:39 AM, Sergio Schvezov wrote:
> > How about using 'adb shell dpkg --print-architecture's result as another key
> entry to lookup in the map? Just in case we add some other arch sooner than
> later
>
> can you elaborate? I'm not sure I understand what you are saying here.

I guess I was too sleepy when I commented on this :-/

    arch = adb.shell('dpkg --print-architecture').strip()

But instead of constructing the 'key' from appending two strings, a map from the arches seems cleaner:

basic_packages = (
    {'source': 'unity8', 'binary': 'unity8'},
    {'source': 'ubuntu-ui-toolkit',
     'binary': {'armhf': 'qtdeclarative5-ubuntu-ui-toolkit-plugin',
                'i386': 'qtdeclarative5-ubuntu-ui-toolkit-plugin-gles'})

But this is just a hassle for the case where they are the same, so this could work:

basic_packages = (
    {'source': 'unity8', 'binary': {'all': 'unity8'}},
    {'source': 'ubuntu-ui-toolkit',
     'binary': {'armhf': 'qtdeclarative5-ubuntu-ui-toolkit-plugin',
                'i386': 'qtdeclarative5-ubuntu-ui-toolkit-plugin-gles'}})

then when looping over basic_packages just

binary = p['binary'][arch] if arch in p['binary'] else p['binary']['all']

or something like that

[lp:~doanac/phablet-tools/click-x86]

273. By Andy Doan <email address hidden> on 2014-05-14

improve arch handling in click-setup

as per sergio

[Andy Doan (doanac)]

Sergio - nice idea. revno 273 should be close to your suggestion.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Sergio Schvezov (sergiusens)]

> Sergio - nice idea. revno 273 should be close to your suggestion.

thanks, looks good!

review: Approve

=== modified file 'phablet-click-test-setup'
--- phablet-click-test-setup	2014-02-24 14:01:06 +0000
+++ phablet-click-test-setup	2014-05-14 20:13:26 +0000
@@ -61,13 +61,22 @@
 py2_subdir = 'legacy-py2'
 
 basic_packages = (
-    {'source': 'unity8', 'binary': 'unity8'},
-    {'source': 'ubuntu-ui-toolkit',
-     'binary': 'qtdeclarative5-ubuntu-ui-toolkit-plugin'})
+    {
+        'source': 'unity8',
+        'binary': {'all': 'unity8'}
+    },
+    {
+        'source': 'ubuntu-ui-toolkit',
+        'binary': {
+            'armhf': 'qtdeclarative5-ubuntu-ui-toolkit-plugin',
+            'i386': 'qtdeclarative5-ubuntu-ui-toolkit-plugin-gles'
+        }
+    }
+)
 
 python_packages = (
     'python-mock', 'python-dateutil', 'python3-dateutil'
-    )
+)
 
 
 class UbuntuDevice(AndroidBridge):
@@ -193,11 +202,13 @@
         shutil.move(test_dir, target_dir)
 
 
-def fetch_test_base(adb, test_dir):
+def fetch_test_base(adb, test_dir, arch):
     for package in python_packages:
         get_python_binary_package(package, test_dir)
     for package in basic_packages:
-        version = adb.get_package_version(package['binary'])
+        binaries = package['binary']
+        binary = binaries[arch] if arch in binaries else binaries['all']
+        version = adb.get_package_version(binary)
         get_source_package_tests(package['source'], version, test_dir)
 
 
@@ -230,7 +241,7 @@
     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_test_base(adb, test_dir, arch)
     fetch_click_tests(adb, test_dir, args.user, args.click)
     destination = path.join('/home', args.user, 'autopilot')
     if args.wipe: