948992 - DeviceManagerADB expect deviceSerial but the option set by MarionetteTestOption is device_serial.

Status: RESOLVED FIXED

(Testing :: Mozbase, defect)

Description

[Nicolas B. Pierron [:nbp]]

+++ This bug was initially created as a clone of Bug #902679 +++

While using one computer with the gaia-ui-test to run multiple builds on multiples phones, and having one central flashing point.  I noticed that Marionette client was not using the the "-s <serial>" options when calling adb.

When multiple phones are plugged, this breaks the cleanUp phase of the gaia-ui-tests which is calling "adb shell" to remove every file contained on the sdcard.

Comment 1

[Nicolas B. Pierron [:nbp]]

Attachment: Copy the deviceSerial to ADB's device manager.

Comment 2

[Nicolas B. Pierron [:nbp]]

Attachment: gaiatest: Give deviceSerial number to ADB's device manager.

This transfer the device_serial of Marionette to the DeviceManagerADB which is using it to prefix all adb commands with the "-s " command line arguments. Without this, one might not be able to run gaia-ui-tests if multiple devices are plugged on the computer.

This branch should only be merged as soon as the Gecko's part of it has landed. Otherwise the function get_device_manager will not exists.

Comment 3

[Nicolas B. Pierron [:nbp]]

These patches are working fine for testing b2g on arewefastyet.com

Comment 4

[Jonathan Griffin (:jgriffin)]

Comment on attachment 8345971 [details] [diff] [review]
Copy the deviceSerial to ADB's device manager.

Review of attachment 8345971 [details] [diff] [review]:
-----------------------------------------------------------------

::: testing/marionette/client/marionette/runner/mixins/b2g.py
@@ +26,5 @@
>                  raise Exception('Unknown device manager type: %s' % dm_type)
>          return self._device_manager
>  
> +    @property
> +    def device_manager(self, *args, **kwargs):

Technically, getters don't take arguments, which is a fault in the original code.  It would be nice to get rid of them here.

Comment 5

[Nicolas B. Pierron [:nbp]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/a0522e28d970

=> set [leave-open] whiteboard flag for landing the gaia part of this bug.

Comment 6

[Malini Das [:mdas] - Away, not checking bugmail]

Comment on attachment 8345974 [details] [review]
gaiatest: Give deviceSerial number to ADB's device manager.

thanks!

Comment 7

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/a0522e28d970

Comment 8

[Nicolas B. Pierron [:nbp]]

Set checkin-needed flag for Gaia's pull request.

Comment 9

[Ryan VanderMeulen [:RyanVM]]

Master: https://github.com/mozilla-b2g/gaia/commit/e35e1e4e018ccaae6dde1882199bab2ea1776cc3