Bug 1073441 - [mozversion] Include base image version for Flame-KK device. r=wlachance
authorDave Hunt <dhunt@mozilla.com>
Tue, 30 Sep 2014 02:10:00 +0200
changeset 208101 1ffb7f0c497f000c1b0a830d341bfc02c95d5c60
parent 208100 aefb2886f1653ffa6c4e5ef7b2b7c1217eadeff9
child 208102 bbff6a89854a721fa0e844ca4a96b728672c6b1b
child 208125 fe0afc101ad2760a8b891c1b91a875b077b1de80
push id49851
push usercbook@mozilla.com
push dateWed, 01 Oct 2014 08:24:58 +0000
treeherdermozilla-inbound@1ffb7f0c497f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswlachance
bugs1073441
milestone35.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1073441 - [mozversion] Include base image version for Flame-KK device. r=wlachance
testing/mozbase/mozversion/mozversion/mozversion.py
--- a/testing/mozbase/mozversion/mozversion/mozversion.py
+++ b/testing/mozbase/mozversion/mozversion/mozversion.py
@@ -226,18 +226,21 @@ class RemoteB2GVersion(B2GVersion):
             'ro.product.device': 'device_id'}
         for line in build_props.split('\n'):
             if not line.strip().startswith('#') and '=' in line:
                 key, value = [s.strip() for s in line.split('=', 1)]
                 if key in desired_props.keys():
                     self._info[desired_props[key]] = value
 
         if self._info.get('device_id', '').lower() == 'flame':
-            self._info['device_firmware_version_base'] = dm._runCmd(
-                ['shell', 'getprop', 't2m.sw.version']).output[0]
+            for prop in ['ro.boot.bootloader', 't2m.sw.version']:
+                value = dm.shellCheckOutput(['getprop', prop])
+                if value:
+                    self._info['device_firmware_version_base'] = value
+                    break
 
 
 def get_version(binary=None, sources=None, dm_type=None, host=None,
                 device_serial=None):
     """
     Returns the application version information as a dict. You can specify
     a path to the binary of the application or an Android APK file (to get
     version information for Firefox for Android). If this is omitted then the