Bug 1186844 - remove deprecated 'results_urls' options when running talos from harness

--HG--
extra : commitid : JLtHjKVKD2I
extra : rebase_source : 3b8d33852d89cdb38201eb88d60e09ab45fc72ba
This commit is contained in:
Julien Pagès 2015-07-25 11:33:09 +02:00
Родитель 90daf6b5a6
Коммит 013413b9e2
4 изменённых файлов: 1 добавлений и 16 удалений

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

@ -19,7 +19,6 @@ config = {
'virtualenv': [PYTHON, '/tools/misc-python/virtualenv.py'],
},
"title": os.uname()[1].lower().split('.')[0],
"results_url": "http://graphs.mozilla.org/server/collect.cgi",
"default_actions": [
"clobber",
"read-buildbot-config",

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

@ -29,7 +29,6 @@ config = {
'virtualenv': [PYTHON, '/tools/misc-python/virtualenv.py'],
},
"title": os.uname()[1].lower().split('.')[0],
"results_url": "http://graphs.mozilla.org/server/collect.cgi",
"default_actions": [
"clobber",
"read-buildbot-config",

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

@ -28,7 +28,6 @@ config = {
'hg': 'c:/mozilla-build/hg/hg',
},
"title": socket.gethostname().split('.')[0],
"results_url": "http://graphs.mozilla.org/server/collect.cgi",
"default_actions": [
"clobber",
"read-buildbot-config",

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

@ -74,12 +74,6 @@ talos_config_options = [
"default": [],
"help": "Specify the tests to run"
}],
[["--results-url"],
{'action': 'store',
'dest': 'results_url',
'default': None,
'help': "URL to send results to"
}],
]
@ -163,11 +157,6 @@ class Talos(TestingMixin, MercurialScript, BlobUploadMixin):
self.workdir = self.query_abs_dirs()['abs_work_dir'] # convenience
# results output
self.results_url = self.config.get('results_url')
if self.results_url is None:
# use a results_url by default based on the class name in the working directory
self.results_url = 'file://%s' % os.path.join(self.workdir, self.__class__.__name__.lower() + '.txt')
self.installer_url = self.config.get("installer_url")
self.talos_json_url = self.config.get("talos_json_url")
self.talos_json = self.config.get("talos_json")
@ -422,8 +411,7 @@ class Talos(TestingMixin, MercurialScript, BlobUploadMixin):
if binary_path.endswith('.exe'):
binary_path = binary_path[:-4]
kw_options = {'output': 'talos.yml', # options overwritten from **kw
'executablePath': binary_path,
'results_url': self.results_url}
'executablePath': binary_path}
kw_options['activeTests'] = self.query_tests()
if self.config.get('title'):
kw_options['title'] = self.config['title']