diff options
Diffstat (limited to 'build/android/pylib')
3 files changed, 14 insertions, 14 deletions
diff --git a/build/android/pylib/base/base_test_result.py b/build/android/pylib/base/base_test_result.py index b79ef5c6b..584ca84f6 100644 --- a/build/android/pylib/base/base_test_result.py +++ b/build/android/pylib/base/base_test_result.py @@ -15,9 +15,9 @@ from lib.results import result_types # pylint: disable=import-error # This must match the source adding the suffix: bit.ly/3Zmwwyx MULTIPROCESS_SUFFIX = '__multiprocess_mode' -# This must match the source adding the suffix (TODO(zbikowski): add link) -_NULL_MUTATION_SUFFIX = '_null_' -_MUTATION_SUFFIX_PATTERN = re.compile(r'^(.*)_([a-zA-Z]+)\.\.([a-zA-Z]+)_$') +# This must match the source adding the suffix: bit.ly/3Qt0Ww4 +_NULL_MUTATION_SUFFIX = '__null_' +_MUTATION_SUFFIX_PATTERN = re.compile(r'^(.*)__([a-zA-Z]+)\.\.([a-zA-Z]+)_$') class ResultType: @@ -98,13 +98,13 @@ class BaseTestResult: # The name can include suffixes encoding Webview variant data: # a Webview multiprocess mode suffix and an AwSettings mutation suffix. # If both are present, the mutation suffix will come after the multiprocess - # suffix. The mutation suffix can either be "_null_" or "_{key}..{value}_". + # suffix. The mutation suffix can either be "__null_" or "__{key}..{value}_" # # Examples: - # (...)AwSettingsTest#testAssetUrl__multiprocess_mode_allMutations..true_ - # (...)AwSettingsTest#testAssetUrl__multiprocess_mode_null_ - # (...)AwSettingsTest#testAssetUrl_allMutations..true_ - # org.chromium.android_webview.test.AwSettingsTest#testAssetUrl_null_ + # (...)AwSettingsTest#testAssetUrl__multiprocess_mode__allMutations..true_ + # (...)AwSettingsTest#testAssetUrl__multiprocess_mode__null_ + # (...)AwSettingsTest#testAssetUrl__allMutations..true_ + # org.chromium.android_webview.test.AwSettingsTest#testAssetUrl__null_ # first, strip any AwSettings mutation parameter information # from the RHS of the raw_name diff --git a/build/android/pylib/device/commands/java/src/org/chromium/android/commands/unzip/Unzip.java b/build/android/pylib/device/commands/java/src/org/chromium/android/commands/unzip/Unzip.java index 54ba8ac72..726f8cfc4 100644 --- a/build/android/pylib/device/commands/java/src/org/chromium/android/commands/unzip/Unzip.java +++ b/build/android/pylib/device/commands/java/src/org/chromium/android/commands/unzip/Unzip.java @@ -18,9 +18,7 @@ import java.io.PrintStream; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; -/** - * Minimal implementation of the command-line unzip utility for Android. - */ +/** Minimal implementation of the command-line unzip utility for Android. */ public class Unzip { private static final String TAG = "Unzip"; @@ -94,4 +92,3 @@ public class Unzip { unzip(args); } } - diff --git a/build/android/pylib/local/emulator/avd.py b/build/android/pylib/local/emulator/avd.py index 1387d9054..6f3a5d46a 100644 --- a/build/android/pylib/local/emulator/avd.py +++ b/build/android/pylib/local/emulator/avd.py @@ -556,7 +556,7 @@ class AvdConfig: # https://bit.ly/3agmjcM). # Wait for this step to complete since it can take a while for old OSs # like M, otherwise the avd may have "Encryption Unsuccessful" error. - instance.device.WaitUntilFullyBooted(decrypt=True, timeout=180, retries=0) + instance.device.WaitUntilFullyBooted(decrypt=True, timeout=360, retries=0) if additional_apks: for apk in additional_apks: @@ -884,8 +884,11 @@ class AvdConfig: with ini.update_ini_file(config_path) as config_contents: config_contents.update(properties) - # Create qt config file to disable adb warning when launched in window mode. + # Create qt config file to disable certain warnings when launched in window. with ini.update_ini_file(self._qt_config_path) as config_contents: + # Disable nested virtualization warning. + config_contents['General'] = {'showNestedWarning': 'false'} + # Disable adb warning. config_contents['set'] = {'autoFindAdb': 'false'} def _Initialize(self): |