corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 980511 - Uplift Add-on SDK to Firefox

Browse Source
This commit is contained in:
Erik Vold
2014-03-06 14:21:49 -08:00
parent 88162368ec
commit 02b270ec51
6 changed files with 141 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
addon-sdk/source/python-lib/cuddlefish/runner.py
View File

@@ -193,11 +193,16 @@ class RemoteFennecRunner(mozrunner.Runner):
print "Killing running Firefox instance ..."
subprocess.call([self._adb_path, "shell",
"am force-stop " + self._intent_name])
time.sleep(2)
if self.getProcessPID(self._intent_name) != None:
raise Exception("Unable to automatically kill running Firefox" +
" instance. Please close it manually before " +
"executing cfx.")
time.sleep(7)
# It appears recently that the PID still exists even after
# Fennec closes, so removing this error still allows the tests
# to pass as the new Fennec instance is able to start.
# Leaving error in but commented out for now.
#
#if self.getProcessPID(self._intent_name) != None:
# raise Exception("Unable to automatically kill running Firefox" +
# " instance. Please close it manually before " +
# "executing cfx.")
print "Pushing the addon to your device"