mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-19 00:05:36 +00:00
Bug 1204247: Remove code supporting metro under testing/ r=jmaher
Bug 1204247: Remove code supporting metro under testing/ Differential Revision: https://phabricator.services.mozilla.com/D14386 --HG-- extra : moz-landing-system : lando
This commit is contained in:
parent
c2fab2fa37
commit
89f1fb7652
@ -370,13 +370,6 @@ class MochitestArguments(ArgumentContainer):
|
||||
"default": False,
|
||||
"help": "Delay execution between tests.",
|
||||
}],
|
||||
[["--metro-immersive"],
|
||||
{"action": "store_true",
|
||||
"dest": "immersiveMode",
|
||||
"default": False,
|
||||
"help": "Launches tests in an immersive browser.",
|
||||
"suppress": True,
|
||||
}],
|
||||
[["--httpd-path"],
|
||||
{"dest": "httpdPath",
|
||||
"default": None,
|
||||
@ -794,15 +787,6 @@ class MochitestArguments(ArgumentContainer):
|
||||
if options.testingModulesDir[-1] != '/':
|
||||
options.testingModulesDir += '/'
|
||||
|
||||
if options.immersiveMode:
|
||||
if not mozinfo.isWin:
|
||||
parser.error("immersive is only supported on Windows 8 and up.")
|
||||
options.immersiveHelperPath = os.path.join(
|
||||
options.utilityPath, "metrotestharness.exe")
|
||||
if not os.path.exists(options.immersiveHelperPath):
|
||||
parser.error("%s not found, cannot launch immersive tests." %
|
||||
options.immersiveHelperPath)
|
||||
|
||||
if options.runUntilFailure:
|
||||
if not options.repeat:
|
||||
options.repeat = 29
|
||||
|
@ -1039,8 +1039,6 @@ class MochitestDesktop(object):
|
||||
if options.flavor != 'plain':
|
||||
self.testRoot = options.flavor
|
||||
|
||||
if options.flavor == 'browser' and options.immersiveMode:
|
||||
self.testRoot = 'metro'
|
||||
else:
|
||||
self.testRoot = self.TEST_PATH
|
||||
self.testRootAbs = os.path.join(SCRIPT_DIR, self.testRoot)
|
||||
@ -2695,10 +2693,6 @@ toolbar#nav-bar {
|
||||
try:
|
||||
self.startServers(options, debuggerInfo)
|
||||
|
||||
if options.immersiveMode:
|
||||
options.browserArgs.extend(('-firefoxpath', options.app))
|
||||
options.app = self.immersiveHelperPath
|
||||
|
||||
if options.jsdebugger:
|
||||
options.browserArgs.extend(['-jsdebugger', '-wait-for-jsdebugger'])
|
||||
|
||||
@ -2907,13 +2901,7 @@ toolbar#nav-bar {
|
||||
self.shutdownLeaks = shutdownLeaks
|
||||
self.lsanLeaks = lsanLeaks
|
||||
self.bisectChunk = bisectChunk
|
||||
|
||||
# With metro browser runs this script launches the metro test harness which launches
|
||||
# the browser. The metro test harness hands back the real browser process id via log
|
||||
# output which we need to pick up on and parse out. This variable tracks the real
|
||||
# browser process id if we find it.
|
||||
self.browserProcessId = None
|
||||
|
||||
self.stackFixerFunction = self.stackFixer()
|
||||
|
||||
def processOutputLine(self, line):
|
||||
|
@ -30,7 +30,6 @@ config = {
|
||||
"install",
|
||||
"run-tests",
|
||||
],
|
||||
"metro_harness_path_frmt": "%(metro_base_path)s/metro/metrotestharness.exe",
|
||||
"download_minidump_stackwalk": True,
|
||||
"tooltool_cache": os.path.join('c:\\', 'build', 'tooltool_cache'),
|
||||
"minidump_stackwalk_path": "win32-minidump_stackwalk.exe",
|
||||
|
@ -29,7 +29,6 @@ config = {
|
||||
"install",
|
||||
"run-tests",
|
||||
],
|
||||
"metro_harness_path_frmt": "%(metro_base_path)s/metro/metrotestharness.exe",
|
||||
"download_minidump_stackwalk": True,
|
||||
"tooltool_cache": os.path.join('c:\\', 'build', 'tooltool_cache'),
|
||||
"minidump_stackwalk_path": "win32-minidump_stackwalk.exe",
|
||||
|
@ -25,7 +25,6 @@ config = {
|
||||
"setup-mitmproxy",
|
||||
"run-tests",
|
||||
],
|
||||
"metro_harness_path_frmt": "%(metro_base_path)s/metro/metrotestharness.exe",
|
||||
"download_minidump_stackwalk": True,
|
||||
"tooltool_cache": os.path.join('c:\\', 'build', 'tooltool_cache'),
|
||||
"minidump_stackwalk_path": "win32-minidump_stackwalk.exe",
|
||||
|
@ -22,7 +22,6 @@ config = {
|
||||
"setup-mitmproxy",
|
||||
"run-tests",
|
||||
],
|
||||
"metro_harness_path_frmt": "%(metro_base_path)s/metro/metrotestharness.exe",
|
||||
"download_minidump_stackwalk": True,
|
||||
"tooltool_cache": os.path.join('Y:\\', 'tooltool-cache'),
|
||||
"minidump_stackwalk_path": "win32-minidump_stackwalk.exe",
|
||||
|
@ -24,7 +24,6 @@ config = {
|
||||
"setup-mitmproxy",
|
||||
"run-tests",
|
||||
],
|
||||
"metro_harness_path_frmt": "%(metro_base_path)s/metro/metrotestharness.exe",
|
||||
"download_minidump_stackwalk": True,
|
||||
"tooltool_cache": os.path.join('c:\\', 'build', 'tooltool_cache'),
|
||||
"minidump_stackwalk_path": "win32-minidump_stackwalk.exe",
|
||||
|
Loading…
Reference in New Issue
Block a user