-
Notifications
You must be signed in to change notification settings - Fork 3.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
sensors: Cleanup iframe-related tests. (#25626)
Even after r807421 those tests are presenting some occasional flakiness in the form of timeouts and, in a few cases, crashes in other parts of the stack. Clean up the code a little bit to make the code easier to follow and perhaps reduce the chance of timeouts: * send_message_to_frame() does not need to be an async function. * Use t.add_cleanup() to a few tests to make sure any iframe we add is properly removed even if an error occurs. * Remove all calls to the assert_*() functions from both the code path used by initialize_generic_sensor_tests() as well as generic_sensor_mocks.js, so that we no longer need to include testharness.js in the iframe handler page. * Make the onmessage handler in the iframe page also send a reply when errors occur. Bug: 1073865 Change-Id: Id6f682c95212d7ad9662f8aadad31c866752b0af Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2418333 Auto-Submit: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> Commit-Queue: Reilly Grant <reillyg@chromium.org> Reviewed-by: Reilly Grant <reillyg@chromium.org> Cr-Commit-Position: refs/heads/master@{#808497} Co-authored-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
- Loading branch information
1 parent
7445e5a
commit 9fa293b
Showing
4 changed files
with
69 additions
and
55 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,62 +1,68 @@ | ||
| <!DOCTYPE html> | ||
| <meta charset="utf-8"> | ||
| <title>iframe sensor tester</title> | ||
| <script src="/resources/testharness.js"></script> | ||
| <script src="/generic-sensor/resources/generic-sensor-helpers.js"></script> | ||
| <script> | ||
| let mockBackend = null; | ||
| let sensor = null; | ||
| let sensorType = null; | ||
|
|
||
| window.onmessage = (e) => { | ||
| function postReply(event, reply) { | ||
| event.source.postMessage({ command: event.data.command, result: reply }, '*'); | ||
| } | ||
|
|
||
| window.onmessage = async (e) => { | ||
| if (e.data.command === 'create_sensor') { | ||
| assert_equals(sensor, null); | ||
| initialize_generic_sensor_tests().then((backend) => { | ||
| mockBackend = backend; | ||
| try { | ||
| sensor = new self[e.data.type](); | ||
| sensorType = e.data.type; | ||
| e.source.postMessage({command: e.data.command, | ||
| result: 'success'}, '*'); | ||
| } catch (error) { | ||
| e.source.postMessage({command: e.data.command, result: error}, '*'); | ||
| } | ||
| }); | ||
| if (sensor) { | ||
| postReply(e, 'success'); | ||
| return; | ||
| } | ||
|
|
||
| try { | ||
| mockBackend = await initialize_generic_sensor_tests(); | ||
| sensor = new self[e.data.type](); | ||
| sensorType = e.data.type; | ||
|
|
||
| postReply(e, 'success'); | ||
| } catch (error) { | ||
| postReply(e, error); | ||
| } | ||
| } else if (e.data.command === 'start_sensor') { | ||
| assert_not_equals(sensor, null); | ||
| if (!sensor) { | ||
| postReply(e, '"create_sensor" must be called first'); | ||
| return; | ||
| } | ||
|
|
||
| try { | ||
| sensor.addEventListener('reading', () => { | ||
| postReply(e, 'success'); | ||
| }, { once: true }); | ||
| sensor.start(); | ||
| let onReadingListener = () => { | ||
| e.source.postMessage({command: e.data.command, | ||
| result: 'success'}, '*'); | ||
| } | ||
| sensor.addEventListener('reading', onReadingListener, {once: true}); | ||
| } catch (error) { | ||
| e.source.postMessage({command: e.data.command, result: error}, '*'); | ||
| postReply(e, error); | ||
| } | ||
| } else if (e.data.command === 'is_sensor_suspended') { | ||
| if (!mockBackend) { | ||
| e.source.postMessage({ | ||
| command: e.data.command, | ||
| result: '"create_sensor" must be called first' | ||
| }, '*'); | ||
| postReply(e, '"create_sensor" must be called first'); | ||
| return; | ||
| } | ||
|
|
||
| mockBackend.getSensorProvider().getCreatedSensor(sensorType).then(mockPlatformSensor => { | ||
| e.source.postMessage({ | ||
| command: e.data.command, | ||
| result: !mockPlatformSensor.isReadingData() | ||
| }, '*'); | ||
| }); | ||
| try { | ||
| const mockPlatformSensor = await mockBackend.getSensorProvider().getCreatedSensor(sensorType); | ||
| postReply(e, !mockPlatformSensor.isReadingData()); | ||
| } catch (error) { | ||
| postReply(e, error); | ||
| } | ||
| } else if (e.data.command === 'reset_sensor_backend') { | ||
| if (sensor) { | ||
| sensor.stop(); | ||
| await mockBackend.reset(); | ||
|
|
||
| sensor = null; | ||
| mockBackend = null; | ||
| } | ||
| mockBackend.reset().then(() => { | ||
| e.source.postMessage({command: e.data.command, | ||
| result: 'success'}, '*'); | ||
| }); | ||
|
|
||
| postReply(e, 'success'); | ||
| } | ||
| } | ||
| </script> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters