fix: more flaky metrics.test.js fixes

[misterdjules]

Pre-Submission Checklist

• Opened an issue discussing these changes before opening the PR
• Ran the linter and tests via make prepush
• Included comprehensive and convincing tests for changes

Issues

Closes:

• Issue metrics.test.js seems to be flaky #1691

Summarize the issues that discussed these changes

Changes

What does this PR do?

Fix more occurrences of the problem described at #1691. Previous fixes did not cover the whole tests suite. I expect all it to be fully covered now.

[misterdjules]

Tests failure is not a regression due to this PR and is fixed by #1729, thus merging this asap. Thanks for the review @DonutEspresso!

[misterdjules]

Ah, that commit message should probably have used the test: prefix, not fix:. It shouldn't have any impact though, since I assume the next release will be at least a patch release and thus would bump the patch version number anyway.