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

Jump to bottom

[Merged by Bors] - change panicking test to not run on global task pool #4998

Closed
wants to merge 2 commits into from
Closed

[Merged by Bors] - change panicking test to not run on global task pool #4998

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84b7b1f
change panicking test to not run on global task pool
hymm Jun 12, 2022
e9eb212
add comment for fix
hymm Jun 13, 2022
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
29 changes: 15 additions & 14 deletions crates/bevy_transform/src/systems.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ mod test {

let mut update_stage = SystemStage::parallel();
update_stage.add_system(parent_update_system);
update_stage.add_system(transform_propagate_system);
update_stage.add_system(transform_propagate_system.after(parent_update_system));

let mut schedule = Schedule::default();
schedule.add_stage("update", update_stage);
Expand Down Expand Up @@ -158,7 +158,7 @@ mod test {

let mut update_stage = SystemStage::parallel();
update_stage.add_system(parent_update_system);
update_stage.add_system(transform_propagate_system);
update_stage.add_system(transform_propagate_system.after(parent_update_system));

let mut schedule = Schedule::default();
schedule.add_stage("update", update_stage);
Expand Down Expand Up @@ -201,7 +201,7 @@ mod test {

let mut update_stage = SystemStage::parallel();
update_stage.add_system(parent_update_system);
update_stage.add_system(transform_propagate_system);
update_stage.add_system(transform_propagate_system.after(parent_update_system));

let mut schedule = Schedule::default();
schedule.add_stage("update", update_stage);
Expand Down Expand Up @@ -286,7 +286,7 @@ mod test {
let mut app = App::new();

app.add_system(parent_update_system);
app.add_system(transform_propagate_system);
app.add_system(transform_propagate_system.after(parent_update_system));

let translation = vec3(1.0, 0.0, 0.0);

Expand Down Expand Up @@ -339,33 +339,34 @@ mod test {
#[test]
#[should_panic]
fn panic_when_hierarchy_cycle() {
let mut app = App::new();
let mut world = World::default();
// This test is run on a single thread in order to avoid breaking the global task pool by panicking
// This fixes the flaky tests reported in https://github.com/bevyengine/bevy/issues/4996
let mut update_stage = SystemStage::single_threaded();
hymm marked this conversation as resolved.
Show resolved Hide resolved

app.add_system(parent_update_system);
app.add_system(transform_propagate_system);
update_stage.add_system(parent_update_system);
update_stage.add_system(transform_propagate_system.after(parent_update_system));

let child = app
.world
let child = world
.spawn()
.insert_bundle((Transform::identity(), GlobalTransform::default()))
.id();

let grandchild = app
.world
let grandchild = world
.spawn()
.insert_bundle((
Transform::identity(),
GlobalTransform::default(),
Parent(child),
))
.id();
app.world.spawn().insert_bundle((
world.spawn().insert_bundle((
Transform::default(),
GlobalTransform::default(),
Children::with(&[child]),
));
app.world.entity_mut(child).insert(Parent(grandchild));
world.entity_mut(child).insert(Parent(grandchild));

app.update();
update_stage.run(&mut world);
}
}