test: --enable-features=WebBluetooth by default (#3480)

Author: sadym-chromium

tests/bluetooth/test_characteristic_emulation.py

@@ -137,12 +137,6 @@ async def teardown(websocket, context_id):
 
 
 @pytest.mark.asyncio
-@pytest.mark.parametrize('capabilities', [{
-    'goog:chromeOptions': {
-        'args': ['--enable-features=WebBluetooth']
-    }
-}],
-                         indirect=True)
 @pytest.mark.parametrize('property', [
     'broadcast', 'read', 'writeWithoutResponse', 'write', 'notify', 'indicate',
     'authenticatedSignedWrites'
@@ -193,12 +187,6 @@ async def test_bluetooth_simulateCharacteristic(websocket, context_id, html,
 
 
 @pytest.mark.asyncio
-@pytest.mark.parametrize('capabilities', [{
-    'goog:chromeOptions': {
-        'args': ['--enable-features=WebBluetooth']
-    }
-}],
-                         indirect=True)
 async def test_bluetooth_add_same_characteristic_uuid_twice(
         websocket, context_id):
     device_address = await setup_device(websocket, context_id)
@@ -219,12 +207,6 @@ async def test_bluetooth_add_same_characteristic_uuid_twice(
 
 
 @pytest.mark.asyncio
-@pytest.mark.parametrize('capabilities', [{
-    'goog:chromeOptions': {
-        'args': ['--enable-features=WebBluetooth']
-    }
-}],
-                         indirect=True)
 async def test_bluetooth_remove_unknown_characteristic_uuid(
         websocket, context_id):
     device_address = await setup_device(websocket, context_id)
@@ -245,12 +227,6 @@ async def test_bluetooth_remove_unknown_characteristic_uuid(
 
 
 @pytest.mark.asyncio
-@pytest.mark.parametrize('capabilities', [{
-    'goog:chromeOptions': {
-        'args': ['--enable-features=WebBluetooth']
-    }
-}],
-                         indirect=True)
 async def test_bluetooth_add_characteristic_to_unknown_device(
         websocket, context_id):
     await execute_command(
@@ -273,12 +249,6 @@ async def test_bluetooth_add_characteristic_to_unknown_device(
 
 
 @pytest.mark.asyncio
-@pytest.mark.parametrize('capabilities', [{
-    'goog:chromeOptions': {
-        'args': ['--enable-features=WebBluetooth']
-    }
-}],
-                         indirect=True)
 async def test_bluetooth_add_characteristic_to_unknown_service(
         websocket, context_id):
     device_address = await setup_device(websocket, context_id)
@@ -296,12 +266,6 @@ async def test_bluetooth_add_characteristic_to_unknown_service(
 
 
 @pytest.mark.asyncio
-@pytest.mark.parametrize('capabilities', [{
-    'goog:chromeOptions': {
-        'args': ['--enable-features=WebBluetooth']
-    }
-}],
-                         indirect=True)
 async def test_bluetooth_remove_characteristic_uuid_with_properties(
         websocket, context_id):
     device_address = await setup_device(websocket, context_id)
@@ -336,12 +300,6 @@ async def test_bluetooth_remove_characteristic_uuid_with_properties(
 
 
 @pytest.mark.asyncio
-@pytest.mark.parametrize('capabilities', [{
-    'goog:chromeOptions': {
-        'args': ['--enable-features=WebBluetooth']
-    }
-}],
-                         indirect=True)
 @pytest.mark.parametrize(
     'write_type', [('writeValueWithoutResponse', 'write-without-response'),
                    ('writeValueWithResponse', 'write-with-response')])
@@ -396,12 +354,6 @@ async def test_bluetooth_characteristic_write_event(websocket, context_id,
 
 
 @pytest.mark.asyncio
-@pytest.mark.parametrize('capabilities', [{
-    'goog:chromeOptions': {
-        'args': ['--enable-features=WebBluetooth']
-    }
-}],
-                         indirect=True)
 async def test_bluetooth_characteristic_read_event(websocket, context_id,
                                                    html):
     await setup_characteristic(websocket, context_id, html,
@@ -466,12 +418,6 @@ async def test_bluetooth_characteristic_read_event(websocket, context_id,
 
 
 @pytest.mark.asyncio
-@pytest.mark.parametrize('capabilities', [{
-    'goog:chromeOptions': {
-        'args': ['--enable-features=WebBluetooth']
-    }
-}],
-                         indirect=True)
 async def test_bluetooth_characteristic_notification_event(
         websocket, context_id, html):
     device_address = await setup_characteristic(websocket, context_id, html,

tests/bluetooth/test_descriptor_emulation.py

@@ -84,12 +84,6 @@ async def teardown(websocket, context_id):
 
 
 @pytest.mark.asyncio
-@pytest.mark.parametrize('capabilities', [{
-    'goog:chromeOptions': {
-        'args': ['--enable-features=WebBluetooth']
-    }
-}],
-                         indirect=True)
 async def test_bluetooth_simulateService(websocket, context_id, html):
     device_address = await setup_granted_device(
         websocket, context_id, html,
@@ -145,12 +139,6 @@ async def test_bluetooth_simulateService(websocket, context_id, html):
 
 
 @pytest.mark.asyncio
-@pytest.mark.parametrize('capabilities', [{
-    'goog:chromeOptions': {
-        'args': ['--enable-features=WebBluetooth']
-    }
-}],
-                         indirect=True)
 async def test_bluetooth_add_same_descriptor_uuid_twice(websocket, context_id):
     device_address = await setup_device(websocket, context_id)
     await simulate_service(websocket, context_id, device_address,
@@ -177,12 +165,6 @@ async def test_bluetooth_add_same_descriptor_uuid_twice(websocket, context_id):
 
 
 @pytest.mark.asyncio
-@pytest.mark.parametrize('capabilities', [{
-    'goog:chromeOptions': {
-        'args': ['--enable-features=WebBluetooth']
-    }
-}],
-                         indirect=True)
 async def test_bluetooth_remove_unknown_descriptor_uuid(websocket, context_id):
     device_address = await setup_device(websocket, context_id)
     await simulate_service(websocket, context_id, device_address,
@@ -209,12 +191,6 @@ async def test_bluetooth_remove_unknown_descriptor_uuid(websocket, context_id):
 
 
 @pytest.mark.asyncio
-@pytest.mark.parametrize('capabilities', [{
-    'goog:chromeOptions': {
-        'args': ['--enable-features=WebBluetooth']
-    }
-}],
-                         indirect=True)
 async def test_bluetooth_add_descriptor_to_unknown_device(
         websocket, context_id):
     await execute_command(
@@ -238,12 +214,6 @@ async def test_bluetooth_add_descriptor_to_unknown_device(
 
 
 @pytest.mark.asyncio
-@pytest.mark.parametrize('capabilities', [{
-    'goog:chromeOptions': {
-        'args': ['--enable-features=WebBluetooth']
-    }
-}],
-                         indirect=True)
 async def test_bluetooth_add_descriptor_to_unknown_service(
         websocket, context_id):
     device_address = await setup_device(websocket, context_id)
@@ -261,12 +231,6 @@ async def test_bluetooth_add_descriptor_to_unknown_service(
 
 
 @pytest.mark.asyncio
-@pytest.mark.parametrize('capabilities', [{
-    'goog:chromeOptions': {
-        'args': ['--enable-features=WebBluetooth']
-    }
-}],
-                         indirect=True)
 async def test_bluetooth_add_descriptor_to_unknown_characteristic(
         websocket, context_id):
     device_address = await setup_device(websocket, context_id)
@@ -288,12 +252,6 @@ async def test_bluetooth_add_descriptor_to_unknown_characteristic(
 
 
 @pytest.mark.asyncio
-@pytest.mark.parametrize('capabilities', [{
-    'goog:chromeOptions': {
-        'args': ['--enable-features=WebBluetooth']
-    }
-}],
-                         indirect=True)
 async def test_bluetooth_descriptor_write_event(websocket, context_id, html):
     await setup_descriptor(websocket, context_id, html,
                            HEART_RATE_SERVICE_UUID,
@@ -348,12 +306,6 @@ async def test_bluetooth_descriptor_write_event(websocket, context_id, html):
 
 
 @pytest.mark.asyncio
-@pytest.mark.parametrize('capabilities', [{
-    'goog:chromeOptions': {
-        'args': ['--enable-features=WebBluetooth']
-    }
-}],
-                         indirect=True)
 async def test_bluetooth_descriptor_read_event(websocket, context_id, html):
     await setup_descriptor(websocket, context_id, html,
                            HEART_RATE_SERVICE_UUID,

tests/bluetooth/test_emulation.py

@@ -31,12 +31,6 @@ async def teardown(websocket, context_id):
 @pytest.mark.asyncio
 @pytest.mark.parametrize("state_1", ["absent", "powered-off", "powered-on"])
 @pytest.mark.parametrize("state_2", ["absent", "powered-off", "powered-on"])
-@pytest.mark.parametrize('capabilities', [{
-    'goog:chromeOptions': {
-        'args': ['--enable-features=WebBluetooth']
-    }
-}],
-                         indirect=True)
 async def test_simulate_create_adapter_twice(websocket, context_id, state_1,
                                              state_2):
     await execute_command(
@@ -59,12 +53,6 @@ async def test_simulate_create_adapter_twice(websocket, context_id, state_1,
 
 
 @pytest.mark.asyncio
-@pytest.mark.parametrize('capabilities', [{
-    'goog:chromeOptions': {
-        'args': ['--enable-features=WebBluetooth']
-    }
-}],
-                         indirect=True)
 async def test_bluetooth_requestDevicePromptUpdated(websocket, context_id,
                                                     html):
     await subscribe(websocket, ['bluetooth'])
@@ -86,12 +74,6 @@ async def test_bluetooth_requestDevicePromptUpdated(websocket, context_id,
 
 
 @pytest.mark.asyncio
-@pytest.mark.parametrize('capabilities', [{
-    'goog:chromeOptions': {
-        'args': ['--enable-features=WebBluetooth']
-    }
-}],
-                         indirect=True)
 @pytest.mark.parametrize('accept', [True, False])
 async def test_bluetooth_handleRequestDevicePrompt(websocket, context_id, html,
                                                    accept):

tests/bluetooth/test_gatt_connection.py

@@ -44,12 +44,6 @@ async def teardown(websocket, context_id):
 
 
 @pytest.mark.asyncio
-@pytest.mark.parametrize('capabilities', [{
-    'goog:chromeOptions': {
-        'args': ['--enable-features=WebBluetooth']
-    }
-}],
-                         indirect=True)
 @pytest.mark.parametrize('code', [0x0, 0x1, 0x2])
 async def test_bluetooth_simulateGattConnectionResponse(
         websocket, context_id, html, code):

tests/bluetooth/test_handle_prompt.py

@@ -29,12 +29,6 @@ async def teardown(websocket, context_id):
 
 
 @pytest.mark.asyncio
-@pytest.mark.parametrize('capabilities', [{
-    'goog:chromeOptions': {
-        'args': ['--enable-features=WebBluetooth']
-    }
-}],
-                         indirect=True)
 async def test_bluetooth_requestDevicePromptUpdated(websocket, context_id,
                                                     html):
     await subscribe(websocket, ['bluetooth.requestDevicePromptUpdated'])
@@ -56,12 +50,6 @@ async def test_bluetooth_requestDevicePromptUpdated(websocket, context_id,
 
 
 @pytest.mark.asyncio
-@pytest.mark.parametrize('capabilities', [{
-    'goog:chromeOptions': {
-        'args': ['--enable-features=WebBluetooth']
-    }
-}],
-                         indirect=True)
 @pytest.mark.parametrize('accept', [True, False])
 async def test_bluetooth_handleRequestDevicePrompt(websocket, context_id, html,
                                                    accept):

tests/bluetooth/test_service_emulation.py

@@ -58,12 +58,6 @@ async def teardown(websocket, context_id):
 
 
 @pytest.mark.asyncio
-@pytest.mark.parametrize('capabilities', [{
-    'goog:chromeOptions': {
-        'args': ['--enable-features=WebBluetooth']
-    }
-}],
-                         indirect=True)
 async def test_bluetooth_simulateService(websocket, context_id, html):
     device_address = await setup_granted_device(
         websocket, context_id, html,
@@ -91,12 +85,6 @@ async def test_bluetooth_simulateService(websocket, context_id, html):
 
 
 @pytest.mark.asyncio
-@pytest.mark.parametrize('capabilities', [{
-    'goog:chromeOptions': {
-        'args': ['--enable-features=WebBluetooth']
-    }
-}],
-                         indirect=True)
 async def test_bluetooth_add_same_service_uuid_twice(websocket, context_id):
     device_address = await setup_device(websocket, context_id)
     await simulate_service(websocket, context_id, device_address,
@@ -112,12 +100,6 @@ async def test_bluetooth_add_same_service_uuid_twice(websocket, context_id):
 
 
 @pytest.mark.asyncio
-@pytest.mark.parametrize('capabilities', [{
-    'goog:chromeOptions': {
-        'args': ['--enable-features=WebBluetooth']
-    }
-}],
-                         indirect=True)
 async def test_bluetooth_remove_unknown_service_uuid(websocket, context_id):
     device_address = await setup_device(websocket, context_id)
     with pytest.raises(
@@ -131,12 +113,6 @@ async def test_bluetooth_remove_unknown_service_uuid(websocket, context_id):
 
 
 @pytest.mark.asyncio
-@pytest.mark.parametrize('capabilities', [{
-    'goog:chromeOptions': {
-        'args': ['--enable-features=WebBluetooth']
-    }
-}],
-                         indirect=True)
 async def test_bluetooth_add_service_to_unknown_device(websocket, context_id):
     await execute_command(
         websocket, {

tests/conftest.py

@@ -120,7 +120,9 @@ async def create_session(connection):
                 "args": [
                     "--disable-infobars",
                     # Required to prevent automatic switch to https.
-                    '--disable-features=HttpsFirstBalancedModeAutoEnable,HttpsUpgrades'
+                    "--disable-features=HttpsFirstBalancedModeAutoEnable,HttpsUpgrades",
+                    # Required for bluetooth testing.
+                    "--enable-features=WebBluetooth"
                 ]
             }
         }