Commit 22584140 authored by James Hawkins's avatar James Hawkins Committed by Commit Bot

cr_components/tests: Fix network tests and infra to run unoptimized.

R=khorimoto@chromium.org

Bug: none
Test: NetworkComponents*
Change-Id: I54f3ab4403acf1f758eadbf0ecba6ed52db777bd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2363874Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Commit-Queue: James Hawkins <jhawkins@chromium.org>
Cr-Commit-Position: refs/heads/master@{#799790}
parent 960127f0
...@@ -72,6 +72,9 @@ for excluded_file in [ ...@@ -72,6 +72,9 @@ for excluded_file in [
'resources/css/text_defaults.css', 'resources/css/text_defaults.css',
'resources/css/text_defaults_md.css', 'resources/css/text_defaults_md.css',
'resources/mojo/mojo/public/js/mojo_bindings_lite.html', 'resources/mojo/mojo/public/js/mojo_bindings_lite.html',
'resources/mojo/mojo/public/mojom/base/time.mojom.html',
'resources/mojo/chromeos/services/network_config/public/mojom/network_types.mojom.html',
'resources/mojo/services/network/public/mojom/ip_address.mojom.html',
# Excludes applying only to Polymer 3. # Excludes applying only to Polymer 3.
'resources/polymer/v3_0/polymer/polymer_bundled.min.js', 'resources/polymer/v3_0/polymer/polymer_bundled.min.js',
......
...@@ -9,13 +9,6 @@ GEN_INCLUDE(['//chrome/test/data/webui/polymer_browser_test_base.js']); ...@@ -9,13 +9,6 @@ GEN_INCLUDE(['//chrome/test/data/webui/polymer_browser_test_base.js']);
GEN('#include "content/public/test/browser_test.h"'); GEN('#include "content/public/test/browser_test.h"');
// Tests are flaky on ChromeOS, debug (crbug.com/1114675).
GEN('#if defined(OS_CHROMEOS) && !defined(NDEBUG)');
GEN('#define MAYBE_All DISABLED_All');
GEN('#else');
GEN('#define MAYBE_All All');
GEN('#endif');
// Polymer 2 test list format: // Polymer 2 test list format:
// //
// ['ModuleNameTest', 'module.js', // ['ModuleNameTest', 'module.js',
...@@ -27,7 +20,7 @@ GEN('#endif'); ...@@ -27,7 +20,7 @@ GEN('#endif');
['../../cr_elements/cr_policy_strings.js'] ['../../cr_elements/cr_policy_strings.js']
], ],
['CrPolicyNetworkIndicatorMojo', 'network/cr_policy_network_indicator_mojo_tests.js', ['CrPolicyNetworkIndicatorMojo', 'network/cr_policy_network_indicator_mojo_tests.js',
[ '../../cr_elements/cr_policy_strings.js' ] ['../../cr_elements/cr_policy_strings.js']
], ],
['NetworkConfig', 'network/network_config_test.js', ['NetworkConfig', 'network/network_config_test.js',
[ [
...@@ -38,26 +31,15 @@ GEN('#endif'); ...@@ -38,26 +31,15 @@ GEN('#endif');
'../../chromeos/fake_network_config_mojom.js', '../../chromeos/fake_network_config_mojom.js',
] ]
], ],
['NetworkConfigElementBehavior', 'network/network_config_element_behavior_test.js', ['NetworkConfigElementBehavior', 'network/network_config_element_behavior_test.js', []],
[] ['NetworkPasswordInput', 'network/network_password_input_test.js', []],
], ].forEach(test => registerTest('NetworkComponents', 'os-settings', ...test));
['NetworkPasswordInput', 'network/network_password_input_test.js',
[]
],
].forEach(test => registerTest('Network', 'internet-config-dialog', ...test));
[ [
['BasePage', 'cellular_setup/base_page_test.js', ['BasePage', 'cellular_setup/base_page_test.js', []],
[] ['FinalPage', 'cellular_setup/final_page_test.js', []],
], ['SimDetectPage', 'cellular_setup/sim_detect_page_test.js', []],
['FinalPage', 'cellular_setup/final_page_test.js',
[]
],
['SimDetectPage', 'cellular_setup/sim_detect_page_test.js',
[]
],
].forEach(test => registerTest('CellularSetup', 'cellular-setup', ...test)); ].forEach(test => registerTest('CellularSetup', 'cellular-setup', ...test));
// clang-format on // clang-format on
function registerTest(componentName, webuiHost, testName, module, deps) { function registerTest(componentName, webuiHost, testName, module, deps) {
...@@ -65,12 +47,12 @@ function registerTest(componentName, webuiHost, testName, module, deps) { ...@@ -65,12 +47,12 @@ function registerTest(componentName, webuiHost, testName, module, deps) {
this[className] = class extends PolymerTest { this[className] = class extends PolymerTest {
/** @override */ /** @override */
get browsePreload() { get browsePreload() {
return `chrome://${webuiHost}/test_loader.html?module=cr_components/chromeos/${module}`; return `chrome://${webuiHost}/`;
} }
/** @override */ /** @override */
get extraLibraries() { get extraLibraries() {
return PolymerTest.prototype.extraLibraries.concat(module).concat(deps); return super.extraLibraries.concat(module).concat(deps);
} }
}; };
......
...@@ -14,7 +14,7 @@ GEN('#include "chromeos/constants/chromeos_features.h"'); ...@@ -14,7 +14,7 @@ GEN('#include "chromeos/constants/chromeos_features.h"');
['CrPolicyNetworkIndicatorMojo', 'network/cr_policy_network_indicator_mojo_tests.m.js'], ['CrPolicyNetworkIndicatorMojo', 'network/cr_policy_network_indicator_mojo_tests.m.js'],
['NetworkConfigElementBehavior', 'network/network_config_element_behavior_test.m.js'], ['NetworkConfigElementBehavior', 'network/network_config_element_behavior_test.m.js'],
['NetworkPasswordInput', 'network/network_password_input_test.m.js'], ['NetworkPasswordInput', 'network/network_password_input_test.m.js'],
].forEach(test => registerTest('Network', ...test)); ].forEach(test => registerTest('NetworkComponents', ...test));
[['BasePage', 'cellular_setup/base_page_test.m.js'], [['BasePage', 'cellular_setup/base_page_test.m.js'],
['FinalPage', 'cellular_setup/final_page_test.m.js'], ['FinalPage', 'cellular_setup/final_page_test.m.js'],
......
...@@ -14,7 +14,10 @@ ...@@ -14,7 +14,10 @@
// clang-format on // clang-format on
suite('CrPolicyNetworkBehaviorMojo', function() { suite('CrPolicyNetworkBehaviorMojo', function() {
suiteSetup(function() { suiteSetup(async () => {
await PolymerTest.importHtml('chrome://resources/mojo/mojo/public/js/mojo_bindings_lite.html');
await PolymerTest.importHtml('chrome://resources/mojo/chromeos/services/network_config/public/mojom/cros_network_config.mojom.html');
Polymer({ Polymer({
is: 'test-behavior', is: 'test-behavior',
...@@ -45,7 +48,6 @@ suite('CrPolicyNetworkBehaviorMojo', function() { ...@@ -45,7 +48,6 @@ suite('CrPolicyNetworkBehaviorMojo', function() {
assertFalse(testBehavior.isNetworkPolicyRecommended(property)); assertFalse(testBehavior.isNetworkPolicyRecommended(property));
}); });
test('user_recommended', function() { test('user_recommended', function() {
const property = { const property = {
activeValue: 'foo', activeValue: 'foo',
......
<link rel="import" href="../../../html/polymer.html"> <link rel="import" href="../../../html/polymer.html">
<link rel="import" href="../../../cr_elements/policy/cr_policy_indicator_behavior.html"> <link rel="import" href="../../../cr_elements/policy/cr_policy_indicator_behavior.html">
<link rel="import" href="chrome://resources/mojo/mojo/public/js/mojo_bindings_lite.html">
<link rel="import" href="chrome://resources/mojo/chromeos/services/network_config/public/mojom/cros_network_config.mojom.html">
<script src="cr_policy_network_behavior_mojo.js"></script> <script src="cr_policy_network_behavior_mojo.js"></script>
<link rel="import" href="../../../html/cr.html"> <link rel="import" href="../../../html/cr.html">
<link rel="import" href="chrome://resources/mojo/mojo/public/js/mojo_bindings_lite.html"> <link rel="import" href="chrome://resources/mojo/mojo/public/js/mojo_bindings_lite.html">
<link rel="import" href="chrome://resources/mojo/services/network/public/mojom/ip_address.mojom.html">
<link rel="import" href="chrome://resources/mojo/chromeos/services/network_config/public/mojom/network_types.mojom.html">
<link rel="import" href="chrome://resources/mojo/mojo/public/mojom/base/time.mojom.html">
<link rel="import" href="chrome://resources/mojo/chromeos/services/network_config/public/mojom/cros_network_config.mojom.html"> <link rel="import" href="chrome://resources/mojo/chromeos/services/network_config/public/mojom/cros_network_config.mojom.html">
<script src="mojo_interface_provider.js"></script> <script src="mojo_interface_provider.js"></script>
<link rel="import" href="../../../html/polymer.html"> <link rel="import" href="../../../html/polymer.html">
<link rel="import" href="chrome://resources/html/load_time_data.html">
<link rel="import" href="chrome://resources/mojo/mojo/public/js/mojo_bindings_lite.html">
<link rel="import" href="mojo_interface_provider.html"> <link rel="import" href="mojo_interface_provider.html">
<link rel="import" href="network_listener_behavior.html"> <link rel="import" href="network_listener_behavior.html">
<link rel="import" href="../../../cr_elements/action_link_css.html"> <link rel="import" href="../../../cr_elements/action_link_css.html">
......
<link rel="import" href="../../../html/assert.html"> <link rel="import" href="../../../html/assert.html">
<link rel="import" href="chrome://resources/mojo/mojo/public/js/mojo_bindings_lite.html">
<link rel="import" href="chrome://resources/mojo/services/network/public/mojom/ip_address.mojom.html">
<link rel="import" href="chrome://resources/mojo/chromeos/services/network_config/public/mojom/network_types.mojom.html">
<link rel="import" href="chrome://resources/mojo/mojo/public/mojom/base/time.mojom.html">
<link rel="import" href="chrome://resources/mojo/chromeos/services/network_config/public/mojom/cros_network_config.mojom.html">
<script src="onc_mojo.js"></script> <script src="onc_mojo.js"></script>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment