Merge pull request #6843 from w3c/sync_574b16f0be4388cbeb05f85f996bb9f371cf7a0c
Return value from assert_success.
diff --git a/hr-time/timeOrigin.html b/hr-time/timeOrigin.html
index 94dfcaa..415d745 100644
--- a/hr-time/timeOrigin.html
+++ b/hr-time/timeOrigin.html
@@ -10,19 +10,22 @@
test(() => {
const startTime = Date.now();
- assert_greater_than_equal(startTime, windowOrigin, 'Date.now() should be at least as large as the window timeOrigin.');
- assert_less_than(startTime - windowOrigin, 500, 'Date.now() should be close to window timeOrigin.');
+ assert_greater_than_equal(startTime + 1, windowOrigin, 'Date.now() should be at least as large as the window timeOrigin.');
+ const startNow = performance.now();
+ assert_less_than_equal(startTime, windowOrigin + startNow + 1, 'Date.now() should be close to window timeOrigin.');
}, 'Window timeOrigin is close to Date.now() when there is no system clock adjustment.');
const workerScript = 'postMessage({timeOrigin: performance.timeOrigin})';
const blob = new Blob([workerScript]);
async_test(function(t) {
+ const beforeWorkerCreation = performance.now();
const worker = new Worker(URL.createObjectURL(blob));
worker.addEventListener('message', t.step_func_done(function(event) {
const workerOrigin = event.data.timeOrigin;
- assert_greater_than(workerOrigin, windowOrigin, 'Worker timeOrigin should be greater than the window timeOrigin.');
- assert_less_than(workerOrigin - windowOrigin, 500, 'Window and worker timeOrigins should be close.');
+ assert_greater_than_equal(workerOrigin, windowOrigin + beforeWorkerCreation, 'Worker timeOrigin should be greater than the window timeOrigin.');
+ const afterWorkerCreation = performance.now();
+ assert_less_than_equal(workerOrigin - windowOrigin, afterWorkerCreation, 'Window and worker timeOrigins should be close.');
}));
}, 'Window and worker timeOrigins are close when created one after another.');
@@ -32,8 +35,7 @@
const worker = new Worker(URL.createObjectURL(blob));
worker.addEventListener('message', t.step_func_done(function(event) {
const workerOrigin = event.data.timeOrigin;
- assert_less_than(workerOrigin - windowOrigin - workerCreation, 100, 'Difference between worker and window timeOrigins should roughly be equal to performance.now() at time of creation.');
- assert_greater_than(workerOrigin - windowOrigin, 200, 'We waited 200ms to spawn the second worker, so its timeOrigin should be much greater than that of the window.');
+ assert_greater_than_equal(workerOrigin - windowOrigin, 200, 'We waited 200ms to spawn the second worker, so its timeOrigin should be greater than that of the window.');
}));
}, 200);
}, 'Window and worker timeOrigins differ when worker is created after a delay.');
