1492239 - Use AndroidMixin from android_emulator_unittest

Status: RESOLVED FIXED

(Testing :: General, enhancement, P1)

Description

[Geoff Brown [:gbrown]]

AndroidMixin was added to support android in the raptor mozharness script. It can be used from android_emulator_unittest.py also, eliminating some duplicate code.

Comment 1

[Geoff Brown [:gbrown]]

Attachment: use AndroidMixin in android_emulator_unittest

https://treeherder.mozilla.org/#/jobs?repo=try&tier=1%2C2%2C3&revision=e034202af9298b7288cb8ccf3f0b66d51c138162

Comment 2

[Geoff Brown [:gbrown]]

Comment on attachment 9011147 [details] [diff] [review]
use AndroidMixin in android_emulator_unittest

Obviously my main concern here was eliminating code duplication, using AndroidMixin where possible, especially for any device interaction. The patch is complicated by a few distractions (sorry!):
 - s/emulator/device/ in some places and moving some code blocks, to make it easier to diff android_emulator_unittest.py vs android_hardware_unittest.py
 - simplification of the emulator configuration since the "emulator.name" was not really useful
 - making the minimum bogomips check configurable

I have eliminated some explicit adb operations, particularly the adbd restart in favor of relying on normal mozdevice operation. I don't see any difference in reliability in try runs -- hopefully this change is safe.

It is possible to eliminate more similar/duplicated code, or perhaps even consider combining scripts into one android_unittest.py, but this seemed like a good start. Would like to hear what you think about additional efforts here.

Comment 3

[Bob Clary [:bc] (inactive)]

Comment on attachment 9011147 [details] [diff] [review]
use AndroidMixin in android_emulator_unittest

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

Looks great. r+

::: testing/mozharness/scripts/android_emulator_unittest.py
@@ +296,4 @@
>      def _verify_emulator_and_restart_on_fail(self):
>          emulator_ok = self._verify_emulator()
>          if not emulator_ok:
> +            self.screenshot("emulator-startup-screenshot-")

Please file a follow up bug to use mozscreenshot's dump_screen/dump_device_screen so we can support hardware screenshots as well.

Comment 4

[Geoff Brown [:gbrown]]

(In reply to Bob Clary [:bc:] from comment #3)
> Please file a follow up bug to use mozscreenshot's
> dump_screen/dump_device_screen so we can support hardware screenshots as
> well.

Thanks - bug 1494437.

Comment 5

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/mozilla-inbound/rev/5b80e87d28c3
Use AndroidMixin for android_emulator_unittest; r=bc

Comment 6

[Stefan Hindli [:stefan_hindli]]

https://hg.mozilla.org/mozilla-central/rev/5b80e87d28c3