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

Unified Diff: chrome/test/data/webui/bluetooth_internals_browsertest.js

Issue 2522793004: Disable BluetoothInternalsTest.Startup_BluetoothInternals on Mac (Closed)
Patch Set: Created 4 years, 1 month 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/data/webui/bluetooth_internals_browsertest.js
diff --git a/chrome/test/data/webui/bluetooth_internals_browsertest.js b/chrome/test/data/webui/bluetooth_internals_browsertest.js
index 99283d06d360dff937e10ae9c9c9bef8e8c00cec..b648018da0de0afeb891f5b18d285600384e8675 100644
--- a/chrome/test/data/webui/bluetooth_internals_browsertest.js
+++ b/chrome/test/data/webui/bluetooth_internals_browsertest.js
@@ -158,7 +158,16 @@ BluetoothInternalsTest.prototype = {
},
};
-TEST_F('BluetoothInternalsTest', 'Startup_BluetoothInternals', function() {
+// Times out on chromium.mac/Mac10.11 Tests. See https://crbug.com/667970.
+GEN('#if defined(OS_MACOSX)');
+GEN('#define MAYBE_Startup_BluetoothInternals ' +
+ 'DISABLED_Startup_BluetoothInternals');
+GEN('#else');
+GEN('#define MAYBE_Startup_BluetoothInternals Startup_BluetoothInternals');
+GEN('#endif');
+
+TEST_F('BluetoothInternalsTest', 'MAYBE_Startup_BluetoothInternals',
+ function() {
var fakeAdapterInfo = {
address: '02:1C:7E:6A:11:5A',
discoverable: false,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698