755427 - Marionette tests don't find emulator executable in OSX

Status: RESOLVED FIXED

(Remote Protocol :: Marionette, defect)

Description

[Marshall Culpepper [:marshall_law]]

In OSX, Marionette fails when attempting to launch the AOSP emulator from the B2G repo.

It looks like emulator.py is assuming the binaries will be in linux-x86, which is only true in a Linux build environment.

Python trace:

Using /Volumes/Boot2Gecko/B2G/objdir-gecko/marionette_venv/mozbase/mozinfo
Finished processing dependencies for marionette==0.2
running webserver on http://10.250.19.176:55544/
Traceback (most recent call last):
  File "runtests.py", line 409, in <module>
    runner.run_tests(tests, testtype=options.type)
  File "runtests.py", line 249, in run_tests
    self.run_test(test, testtype)
  File "runtests.py", line 266, in run_test
    self.start_marionette()
  File "runtests.py", line 207, in start_marionette
    logcat_dir=self.logcat_dir)
  File "/Volumes/Boot2Gecko/B2G/gecko/testing/marionette/client/marionette/marionette.py", line 129, in __init__
    self.emulator.start()
  File "/Volumes/Boot2Gecko/B2G/gecko/testing/marionette/client/marionette/emulator.py", line 232, in start
    self._check_for_b2g()
  File "/Volumes/Boot2Gecko/B2G/gecko/testing/marionette/client/marionette/emulator.py", line 83, in _check_for_b2g
    self._check_file(self.binary)
  File "/Volumes/Boot2Gecko/B2G/gecko/testing/marionette/client/marionette/emulator.py", line 103, in _check_file
    'B2G_HOME correctly?') % filePath)
Exception: File not found: /Volumes/Boot2Gecko/B2G/out/host/linux-x86/bin/emulator; did you pass the B2G home directory as the homedir parameter, or set B2G_HOME correctly?

Comment 1

[Marshall Culpepper [:marshall_law]]

Attachment: Fix for hardcoded emulator linux paths, added --emulator-binary arg to runtests.py

Comment 2

[Marshall Culpepper [:marshall_law]]

Attachment: Fix for hardcoded emulator linux paths, added --emulator-binary arg to runtests.py

Comment 3

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

Comment on attachment 624254 [details] [diff] [review]
Fix for hardcoded emulator linux paths, added --emulator-binary arg to runtests.py

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

Awesome, thanks for the patch! Looks good to me, and I'm adding jgriffin here so he can take a look as well.

Comment 4

[Jonathan Griffin (:jgriffin)]

Comment on attachment 624254 [details] [diff] [review]
Fix for hardcoded emulator linux paths, added --emulator-binary arg to runtests.py

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

Looks good to me too.

Comment 5

[Jonathan Griffin (:jgriffin)]

http://hg.mozilla.org/integration/mozilla-inbound/rev/f81ffb3fba84

Comment 6

[Ryan VanderMeulen [:RyanVM]]

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