Lines 24-48
Link Here
|
24 |
sys.path.insert(0, SCRIPT_DIR) |
24 |
sys.path.insert(0, SCRIPT_DIR) |
25 |
import automationutils |
25 |
import automationutils |
26 |
|
26 |
|
27 |
# -------------------------------------------------------------- |
|
|
28 |
# TODO: this is a hack for mozbase without virtualenv, remove with bug 849900 |
29 |
# |
30 |
here = os.path.dirname(__file__) |
31 |
mozbase = os.path.realpath(os.path.join(os.path.dirname(here), 'mozbase')) |
32 |
|
33 |
try: |
34 |
import mozcrash |
35 |
except: |
36 |
deps = ['mozcrash', |
37 |
'mozfile', |
38 |
'mozlog'] |
39 |
for dep in deps: |
40 |
module = os.path.join(mozbase, dep) |
41 |
if module not in sys.path: |
42 |
sys.path.append(module) |
43 |
import mozcrash |
44 |
# --------------------------------------------------------------- |
45 |
|
46 |
_DEFAULT_PREFERENCE_FILE = os.path.join(SCRIPT_DIR, 'prefs_general.js') |
27 |
_DEFAULT_PREFERENCE_FILE = os.path.join(SCRIPT_DIR, 'prefs_general.js') |
47 |
|
28 |
|
48 |
_DEFAULT_WEB_SERVER = "127.0.0.1" |
29 |
_DEFAULT_WEB_SERVER = "127.0.0.1" |
Lines 1058-1066
Link Here
|
1058 |
self.killAndGetStack(processPID, utilityPath, debuggerInfo) |
1039 |
self.killAndGetStack(processPID, utilityPath, debuggerInfo) |
1059 |
return foundZombie |
1040 |
return foundZombie |
1060 |
|
1041 |
|
1061 |
def checkForCrashes(self, minidumpDir, symbolsPath): |
|
|
1062 |
return mozcrash.check_for_crashes(minidumpDir, symbolsPath, test_name=self.lastTestSeen) |
1063 |
|
1064 |
def runApp(self, testURL, env, app, profileDir, extraArgs, |
1042 |
def runApp(self, testURL, env, app, profileDir, extraArgs, |
1065 |
runSSLTunnel = False, utilityPath = None, |
1043 |
runSSLTunnel = False, utilityPath = None, |
1066 |
xrePath = None, certPath = None, |
1044 |
xrePath = None, certPath = None, |
Lines 1133-1143
Link Here
|
1133 |
# Do a final check for zombie child processes. |
1111 |
# Do a final check for zombie child processes. |
1134 |
zombieProcesses = self.checkForZombies(processLog, utilityPath, debuggerInfo) |
1112 |
zombieProcesses = self.checkForZombies(processLog, utilityPath, debuggerInfo) |
1135 |
|
1113 |
|
1136 |
crashed = self.checkForCrashes(os.path.join(profileDir, "minidumps"), symbolsPath) |
|
|
1137 |
|
1138 |
if crashed or zombieProcesses: |
1139 |
status = 1 |
1140 |
|
1141 |
if os.path.exists(processLog): |
1114 |
if os.path.exists(processLog): |
1142 |
os.unlink(processLog) |
1115 |
os.unlink(processLog) |
1143 |
|
1116 |
|