зеркало из https://github.com/mozilla/gecko-dev.git
Bug 789086 - use unique temporary filename for robotium.config file in mochitest/runtestsremote.py, r=jmaher.
This commit is contained in:
Родитель
6a02ca0a70
Коммит
120a77d996
|
@ -419,7 +419,10 @@ def main():
|
||||||
mp.read(options.robocop)
|
mp.read(options.robocop)
|
||||||
robocop_tests = mp.active_tests(exists=False)
|
robocop_tests = mp.active_tests(exists=False)
|
||||||
|
|
||||||
fHandle = open("robotium.config", "w")
|
fHandle = tempfile.NamedTemporaryFile(suffix='.config',
|
||||||
|
prefix='robotium-',
|
||||||
|
dir=os.getcwd(),
|
||||||
|
delete=False)
|
||||||
fHandle.write("profile=%s\n" % (mochitest.remoteProfile))
|
fHandle.write("profile=%s\n" % (mochitest.remoteProfile))
|
||||||
fHandle.write("logfile=%s\n" % (options.remoteLogFile))
|
fHandle.write("logfile=%s\n" % (options.remoteLogFile))
|
||||||
fHandle.write("host=http://mochi.test:8888/tests\n")
|
fHandle.write("host=http://mochi.test:8888/tests\n")
|
||||||
|
@ -429,7 +432,8 @@ def main():
|
||||||
|
|
||||||
dm.removeFile(os.path.join(deviceRoot, "fennec_ids.txt"))
|
dm.removeFile(os.path.join(deviceRoot, "fennec_ids.txt"))
|
||||||
dm.removeFile(os.path.join(deviceRoot, "robotium.config"))
|
dm.removeFile(os.path.join(deviceRoot, "robotium.config"))
|
||||||
dm.pushFile("robotium.config", os.path.join(deviceRoot, "robotium.config"))
|
dm.pushFile(fHandle.name, os.path.join(deviceRoot, "robotium.config"))
|
||||||
|
os.unlink(fHandle.name)
|
||||||
fennec_ids = os.path.abspath("fennec_ids.txt")
|
fennec_ids = os.path.abspath("fennec_ids.txt")
|
||||||
if not os.path.exists(fennec_ids) and options.robocopIds:
|
if not os.path.exists(fennec_ids) and options.robocopIds:
|
||||||
fennec_ids = options.robocopIds
|
fennec_ids = options.robocopIds
|
||||||
|
|
Загрузка…
Ссылка в новой задаче