Bug 1311723 - Look for mozinfo.json in the correct place when running interactive loaners, r=armenzg

MozReview-Commit-ID: K8fqlo0x4Oc

--HG--
extra : rebase_source : dbc88b48244f3f98b4f64fe12c57bb6e4fb119dc

layout/tools/reftest/mach_test_package_commands.py

@@ -29,7 +29,7 @@ def run_reftest(context, **kwargs):
     normalize = partial(context.normalize_test_path, test_root)
     args.tests = map(normalize, args.tests)
 
-    if mozinfo.info['buildapp'] == 'mobile/android':
+    if mozinfo.info.get('buildapp') == 'mobile/android':
         return run_reftest_android(context, args)
     return run_reftest_desktop(context, args)
 
@@ -70,7 +70,7 @@ def setup_argument_parser():
     import reftestcommandline
 
     global parser
-    mozinfo.find_and_update_from_json(os.path.dirname(here))
+    mozinfo.find_and_update_from_json(here)
     if mozinfo.info.get('buildapp') == 'mobile/android':
         parser = reftestcommandline.RemoteArgumentsParser()
     else:

testing/mochitest/mach_test_package_commands.py

@@ -28,7 +28,7 @@ def run_mochitest(context, **kwargs):
         args.test_paths = map(normalize, args.test_paths)
 
     import mozinfo
-    if mozinfo.info['buildapp'] == 'mobile/android':
+    if mozinfo.info.get('buildapp') == 'mobile/android':
         return run_mochitest_android(context, args)
     return run_mochitest_desktop(context, args)
 
@@ -61,7 +61,7 @@ def run_mochitest_android(context, args):
 
 def setup_argument_parser():
     import mozinfo
-    mozinfo.find_and_update_from_json(os.path.dirname(here))
+    mozinfo.find_and_update_from_json(here)
     app = 'generic'
     if mozinfo.info.get('buildapp') == 'mobile/android':
         app = 'android'