Bug 1321625 - Fix android_emulator_unittest.py for updated path of Marionette. r=gbrown
authorHenrik Skupin <mail@hskupin.info>
Thu, 01 Dec 2016 21:00:18 +0100
changeset 325052 437aab812660f23db1cb6cc9f321c56856da48f7
parent 325051 a63ed01b4c5632a96dc0a626400b5251235c5c5f
child 325053 8ea964e7ab596c985f0b8d9ab86e251b64cadf49
push id24
push usermaklebus@msu.edu
push dateTue, 20 Dec 2016 03:11:33 +0000
reviewersgbrown
bugs1321625
milestone53.0a1
Bug 1321625 - Fix android_emulator_unittest.py for updated path of Marionette. r=gbrown MozReview-Commit-ID: 55HYhab2w5
testing/mozharness/configs/android/androidarm_4_3.py
testing/mozharness/scripts/android_emulator_unittest.py
--- a/testing/mozharness/configs/android/androidarm_4_3.py
+++ b/testing/mozharness/configs/android/androidarm_4_3.py
@@ -352,17 +352,17 @@ config = {
                 "--xre-path=%(xre_path)s",
                 "--dm_trans=adb",
                 "--localBinDir=../bin",
                 "--apk=%(installer_path)s",
                 ".",
             ],
         },
         "marionette": {
-            "run_filename": os.path.join("marionette","runtests.py"),
+            "run_filename": os.path.join("harness", "marionette", "runtests.py"),
             "testsdir": "marionette",
             "options": [
                 "--emulator",
                 "--app=fennec",
                 "--package=%(app)s",
                 "--address=%(address)s",
                 "%(test_manifest)s",
                 "--disable-e10s",
--- a/testing/mozharness/scripts/android_emulator_unittest.py
+++ b/testing/mozharness/scripts/android_emulator_unittest.py
@@ -150,17 +150,17 @@ class AndroidEmulatorTest(BlobUploadMixi
         dirs['abs_modules_dir'] = os.path.join(
             dirs['abs_test_install_dir'], 'modules')
         dirs['abs_blob_upload_dir'] = os.path.join(
             abs_dirs['abs_work_dir'], 'blobber_upload_dir')
         dirs['abs_emulator_dir'] = abs_dirs['abs_work_dir']
         dirs['abs_mochitest_dir'] = os.path.join(
             dirs['abs_test_install_dir'], 'mochitest')
         dirs['abs_marionette_dir'] = os.path.join(
-            dirs['abs_test_install_dir'], 'marionette', 'marionette')
+            dirs['abs_test_install_dir'], 'marionette', 'harness', 'marionette')
         dirs['abs_marionette_tests_dir'] = os.path.join(
             dirs['abs_test_install_dir'], 'marionette', 'tests', 'testing',
             'marionette', 'harness', 'marionette', 'tests')
         dirs['abs_avds_dir'] = self.config.get("avds_dir", "/home/cltbld/.android")
 
         for key in dirs.keys():
             if key not in abs_dirs:
                 abs_dirs[key] = dirs[key]