Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Fixes crash in testTrackpadGesturesAreSentToFramework #55990

Merged
gaaclarke merged 4 commits into from
Oct 23, 2024
Merged

Fixes crash in testTrackpadGesturesAreSentToFramework #55990

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4b487a4
Fixes crash in testTrackpadGesturesAreSentToFramework
gaaclarke Oct 21, 2024
3f1aa3a
turned the test fully back on
gaaclarke Oct 21, 2024
e1e74c8
moved more over
gaaclarke Oct 21, 2024
70dc35e
revert run_tests.py
gaaclarke Oct 21, 2024
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
4 changes: 3 additions & 1 deletion shell/platform/darwin/macos/framework/Source/FlutterViewControllerTest.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,13 +709,15 @@ + (void)respondFalseForSendEvent:(const FlutterKeyEvent&)event
}
}

static const FlutterPointerEvent kDefaultFlutterPointerEvent = {};

- (bool)testTrackpadGesturesAreSentToFramework:(id)engineMock {
// Need to return a real renderer to allow view controller to load.
FlutterRenderer* renderer_ = [[FlutterRenderer alloc] initWithFlutterEngine:engineMock];
OCMStub([engineMock renderer]).andReturn(renderer_);
__block bool called = false;
__block FlutterPointerEvent last_event;
OCMStub([[engineMock ignoringNonObjectArgs] sendPointerEvent:FlutterPointerEvent{}])
OCMStub([[engineMock ignoringNonObjectArgs] sendPointerEvent:kDefaultFlutterPointerEvent])
.andDo((^(NSInvocation* invocation) {
FlutterPointerEvent* event;
[invocation getArgument:&event atIndex:2];
Expand Down
20 changes: 7 additions & 13 deletions testing/run_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,19 +502,13 @@ def make_test(name, flags=None, extra_env=None):
xvfb.stop_virtual_x(build_name)

if is_mac():
# flutter_desktop_darwin_unittests uses global state that isn't handled
# correctly by gtest-parallel.
Copy link
Member Author

@gaaclarke gaaclarke Oct 21, 2024

Choose a reason for hiding this comment

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

I double checked locally with gtest-parallel and my suspicion that this was just another instance of this problem was confirmed. It runs fine after this change.

# https://github.com/flutter/flutter/issues/104789
if not os.path.basename(build_dir).startswith('host_debug'):
# Test is disabled for flaking in debug runs:
# https://github.com/flutter/flutter/issues/127441
run_engine_executable(
build_dir,
'flutter_desktop_darwin_unittests',
executable_filter,
shuffle_flags,
coverage=coverage
)
run_engine_executable(
build_dir,
'flutter_desktop_darwin_unittests',
executable_filter,
shuffle_flags,
coverage=coverage
)
extra_env = metal_validation_env()
extra_env.update(vulkan_validation_env(build_dir))
mac_impeller_unittests_flags = repeat_flags + [
Expand Down