Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

masonry: Disable render tests by default #292

Closed
wants to merge 1 commit into from
Closed

masonry: Disable render tests by default #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,6 @@ env:
# come automatically. If the version specified here is no longer the latest stable version,
# then please feel free to submit a PR that adjusts it along with the potential clippy fixes.
RUST_STABLE_VER: "1.77" # In quotes because otherwise 1.70 would be interpreted as 1.7
# We do not run the masonry snapshot tests, because those require a specific font stack
SKIP_RENDER_SNAPSHOTS: 1
# We do not run the masonry render tests, because those require Vello rendering to be working
# See https://github.com/linebender/vello/pull/439
SKIP_RENDER_TESTS: 1

# Rationale
#
Expand Down
9 changes: 7 additions & 2 deletions crates/masonry/src/testing/harness.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ pub const HARNESS_DEFAULT_SIZE: Size = Size::new(400., 400.);
/// Default background color for tests.
pub const HARNESS_DEFAULT_BACKGROUND_COLOR: Color = Color::rgb8(0x29, 0x29, 0x29);

fn check_env_enabled(key: &'static str) -> bool {
let val = std::env::var_os(key);
val.is_some_and(|it| !it.is_empty())
}

/// A safe headless environment to test widgets in.
///
/// `TestHarness` is a type that simulates an [`AppRoot`](crate::AppRoot)
Expand Down Expand Up @@ -238,7 +243,7 @@ impl TestHarness {
/// Create a bitmap (an array of pixels), paint the window and return the bitmap as an 8-bits-per-channel RGB image.
pub fn render(&mut self) -> RgbaImage {
let (scene, _tree_update) = self.render_root.redraw();
if std::env::var("SKIP_RENDER_TESTS").is_ok_and(|it| !it.is_empty()) {
if !check_env_enabled("ENABLE_RENDER_TESTS") {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So as it happens, the render tests mostly work fine

So I'd probably revert this half of the change

return RgbaImage::from_pixel(1, 1, Rgba([255, 255, 255, 255]));
}
let mut context =
Expand Down Expand Up @@ -513,7 +518,7 @@ impl TestHarness {
test_module_path: &str,
test_name: &str,
) {
if option_env!("SKIP_RENDER_SNAPSHOTS").is_some() {
if !check_env_enabled("ENABLE_RENDER_SNAPSHOTS") {
// FIXME - This is a terrible, awful hack.
// We need a way to skip render snapshots on CI and locally
// until we can make sure the snapshots render the same on
Expand Down