Bug 1589011 - Use a custom domain name in DAMP tests r=ochameau

Depends on D49569

We can stop using the exact host:port URL and rely on the proxy for all DAMP calls

Differential Revision: https://phabricator.services.mozilla.com/D53317

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Julian Descottes 2019-12-09 12:22:14 +00:00
Родитель 014241cca2
Коммит 578a7ff2f3
3 изменённых файлов: 12 добавлений и 8 удалений

Просмотреть файл

@ -460,8 +460,7 @@ class damp(PageloaderTest):
gecko_profile_entries = 10000000
win_counters = w7_counters = linux_counters = mac_counters = None
filters = filter.ignore_first.prepare(1) + filter.median.prepare()
preferences = {'devtools.memory.enabled': True,
'addon.test.damp.webserver': '${webserver}'}
preferences = {'devtools.memory.enabled': True}
unit = 'ms'
subtest_alerts = True
perfherder_framework = 'devtools'

Просмотреть файл

@ -12,14 +12,20 @@ const Services = require("Services");
const { gDevTools } = require("devtools/client/framework/devtools");
const { TargetFactory } = require("devtools/client/framework/target");
const webserver = Services.prefs.getCharPref("addon.test.damp.webserver");
const PAGES_BASE_URL = webserver + "/tests/devtools/addon/content/pages/";
// With Bug 1588203, the talos server supports a dynamic proxy that will
// redirect any http:// call to the talos server. This means we can use
// arbitrary domains for our tests.
// Iframes may be loaded via http://damp.frame1.com, http://damp.frame2.com, etc...
// or any other domain name that is sensible for a given test.
// To trigger frames to load in separate processes, they must have a different
// eTLD+1, which means public suffix (.com, .org, ...) and the label before.
const BASE_DOMAIN = "http://damp.top.com";
const PAGES_BASE_URL = BASE_DOMAIN + "/tests/devtools/addon/content/pages/";
exports.PAGES_BASE_URL = PAGES_BASE_URL;
exports.SIMPLE_URL = PAGES_BASE_URL + "simple.html";
exports.COMPLICATED_URL =
webserver + "/tests/tp5n/bild.de/www.bild.de/index.html";
BASE_DOMAIN + "/tests/tp5n/bild.de/www.bild.de/index.html";
let damp = null;
/*

Просмотреть файл

@ -479,8 +479,7 @@ class Test_get_config(object):
assert 'mac_counters' not in test_config
assert test_config['filters'] is not None
assert test_config['preferences'] == {
'devtools.memory.enabled': True,
'addon.test.damp.webserver': '${webserver}'
'devtools.memory.enabled': True
}
assert test_config['unit'] == 'ms'