UI: deflake UI tests, use always woff2 fonts
- A missing waitForPerfettoIdle() was causing a race
in the select_slice_with_flows.
- Also remove local() fonts and only use the hermetic
woff2 fonts. Doing otherwise makes the ui diff tests
non reproducible (even if using fuzzy pixel diffing).
Change-Id: I402c37f458b76ddc55c1d31727535f45501390cd
diff --git a/tools/install-build-deps b/tools/install-build-deps
index cb27fd6..8399fce 100755
--- a/tools/install-build-deps
+++ b/tools/install-build-deps
@@ -234,8 +234,8 @@
# Example traces for regression tests.
Dependency(
'test/data.zip',
- 'https://storage.googleapis.com/perfetto/test-data-20210715-095628.zip',
- 'e01ca6e1b4fcc8c82a31dd61686654184a8b0385084a0859668afcf64d3e5503',
+ 'https://storage.googleapis.com/perfetto/test-data-20210715-134242.zip',
+ '4d79b592f66ee7c57811407a0e91f34491121aaab989804e137859d03b54e934',
'all', 'all',
),
diff --git a/ui/src/assets/typefaces.scss b/ui/src/assets/typefaces.scss
index 5e4ba16..46ad9b4 100644
--- a/ui/src/assets/typefaces.scss
+++ b/ui/src/assets/typefaces.scss
@@ -11,7 +11,7 @@
font-family: 'Raleway';
font-style: normal;
font-weight: 100;
- src: local('Raleway Thin'), local('Raleway-Thin'), url(assets/Raleway-Thin.woff2) format('woff2');
+ src: url(assets/Raleway-Thin.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
@@ -20,7 +20,7 @@
font-family: 'Raleway';
font-style: normal;
font-weight: 400;
- src: local('Raleway'), local('Raleway-Regular'), url(assets/Raleway-Regular.woff2) format('woff2');
+ src: url(assets/Raleway-Regular.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
@@ -29,7 +29,7 @@
font-family: 'Roboto Condensed';
font-style: normal;
font-weight: 300;
- src: local('Roboto Condensed Light'), local('RobotoCondensed-Light'), url(assets/RobotoCondensed-Light.woff2) format('woff2');
+ src: url(assets/RobotoCondensed-Light.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
@@ -38,7 +38,7 @@
font-family: 'Roboto Condensed';
font-style: normal;
font-weight: 400;
- src: local('Roboto Condensed'), local('RobotoCondensed-Regular'), url(assets/RobotoCondensed-Regular.woff2) format('woff2');
+ src: url(assets/RobotoCondensed-Regular.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
@@ -47,7 +47,7 @@
font-family: 'Roboto Mono';
font-style: normal;
font-weight: 400;
- src: local('Roboto Mono'), local('RobotoMono-Regular'), url(assets/RobotoMono-Regular.woff2) format('woff2');
+ src: url(assets/RobotoMono-Regular.woff2) format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
diff --git a/ui/src/test/ui_integrationtest.ts b/ui/src/test/ui_integrationtest.ts
index bc82ad3..d156720 100644
--- a/ui/src/test/ui_integrationtest.ts
+++ b/ui/src/test/ui_integrationtest.ts
@@ -140,6 +140,7 @@
for (let i = 0; i < 3; i++) {
await page.keyboard.type('\n');
}
+ await waitForPerfettoIdle(page);
await page.focus('canvas');
await page.keyboard.type('f'); // Zoom to selection
await waitForPerfettoIdle(page);
