Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(555)

Unified Diff: scripts/slave/recipe_modules/chromedriver/api.py

Issue 2154383002: Remove build-type arg from Chromedriver tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | scripts/slave/recipe_modules/chromedriver/example.expected/Android_ChromeDriver_basic.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipe_modules/chromedriver/api.py
diff --git a/scripts/slave/recipe_modules/chromedriver/api.py b/scripts/slave/recipe_modules/chromedriver/api.py
index 8d30ca35d482bf75ea2f05fbd7841f9ce9729ec1..ff94bbd0cf95909cd0e791d80c418a6a2fc08eb7 100644
--- a/scripts/slave/recipe_modules/chromedriver/api.py
+++ b/scripts/slave/recipe_modules/chromedriver/api.py
@@ -120,7 +120,7 @@ class ChromedriverApi(recipe_api.RecipeApi):
def _generate_test_command(self, script, chromedriver, log_path,
ref_chromedriver=None, android_package=None,
- build_type=None, verbose=None):
+ verbose=None):
cmd = [
script,
'--chromedriver', chromedriver,
@@ -128,8 +128,6 @@ class ChromedriverApi(recipe_api.RecipeApi):
]
if ref_chromedriver:
cmd.extend(['--reference-chromedriver', ref_chromedriver])
- if build_type:
- cmd.extend(['--build-type', build_type])
if verbose:
cmd.extend(['--verbose'])
if self.m.platform.is_linux:
@@ -140,7 +138,7 @@ class ChromedriverApi(recipe_api.RecipeApi):
def run_python_tests(self, chromedriver, ref_chromedriver, chrome=None,
chrome_version_name=None, android_package=None,
- build_type=None, archive_server_log=True, **kwargs):
+ archive_server_log=True, **kwargs):
"""Run the Chromedriver Python tests."""
version_info = ''
if chrome_version_name:
@@ -153,14 +151,13 @@ class ChromedriverApi(recipe_api.RecipeApi):
self._generate_test_command(
test_script_path, chromedriver, server_log,
ref_chromedriver=ref_chromedriver,
- android_package=android_package,
- build_type=build_type),
+ android_package=android_package),
**kwargs)
if archive_server_log:
self.archive_server_log(server_log)
def run_java_tests(self, chromedriver, chrome=None, chrome_version_name=None,
- android_package=None, build_type=None, verbose=False,
+ android_package=None, verbose=False,
archive_server_log=True, **kwargs):
"""Run the Chromedriver Java tests."""
version_info = ''
@@ -174,7 +171,7 @@ class ChromedriverApi(recipe_api.RecipeApi):
self._generate_test_command(
test_script_path, chromedriver, server_log,
ref_chromedriver=None, android_package=android_package,
- build_type=build_type, verbose=verbose),
+ verbose=verbose),
**kwargs)
if archive_server_log:
self.archive_server_log(server_log)
@@ -183,7 +180,6 @@ class ChromedriverApi(recipe_api.RecipeApi):
"""Run all Chromedriver tests."""
server_name = 'chromedriver'
chromedriver = self.m.chromium.output_dir.join(server_name)
- build_type = self.m.path.basename(self.m.chromium.output_dir)
platform_name = self.m.platform.name
if self.m.platform.is_linux and self.m.platform.bits == 64:
@@ -203,13 +199,11 @@ class ChromedriverApi(recipe_api.RecipeApi):
ref_chromedriver,
chrome_version_name=package,
android_package=package,
- build_type=build_type,
env=test_env,
archive_server_log=archive_server_logs)
self.run_java_tests(chromedriver,
chrome_version_name=package,
android_package=package,
- build_type=build_type,
verbose=True,
env=test_env,
archive_server_log=archive_server_logs)
« no previous file with comments | « no previous file | scripts/slave/recipe_modules/chromedriver/example.expected/Android_ChromeDriver_basic.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698