Bug 753181 - Interpret paths relative to cwd instead of Marionette, r=mdas, a=test-only, DONTBUILD because NPOTB
authorJonathan Griffin <jgriffin@mozilla.com>
Wed, 09 May 2012 17:03:13 -0700
changeset 93606 e94c62e5ea1c620486cfc61fa5778ea530af01ff
parent 93605 cb6759edb5779799922c4ce9a104731c4da2a8e3
child 93607 c7bb680df93bb352016aef3c1f145496eca7e32b
push id22655
push userjgriffin@mozilla.com
push dateThu, 10 May 2012 00:05:34 +0000
treeherdermozilla-central@e94c62e5ea1c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmdas, test-only, DONTBUILD
bugs753181
milestone15.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 753181 - Interpret paths relative to cwd instead of Marionette, r=mdas, a=test-only, DONTBUILD because NPOTB
testing/marionette/client/marionette/runtests.py
--- a/testing/marionette/client/marionette/runtests.py
+++ b/testing/marionette/client/marionette/runtests.py
@@ -260,20 +260,17 @@ class MarionetteTestRunner(object):
         self.marionette = None
 
     def run_test(self, test, testtype):
         if not self.httpd:
             self.start_httpd()
         if not self.marionette:
             self.start_marionette()
 
-        if not os.path.isabs(test):
-            filepath = os.path.join(os.path.dirname(__file__), test)
-        else:
-            filepath = test
+        filepath = os.path.abspath(test)
 
         if os.path.isdir(filepath):
             for root, dirs, files in os.walk(filepath):
                 for filename in files:
                     if ((filename.startswith('test_') or filename.startswith('browser_')) and 
                         (filename.endswith('.py') or filename.endswith('.js'))):
                         filepath = os.path.join(root, filename)
                         self.run_test(filepath, testtype)