Skip to content

Commit ea4e1fb

Browse files
authored
[macOS] Wrap FlutterEngineTest in autoreleasepool (flutter#50832)
Previously, these were not freeing allocations. This resulted in a lot of running engines/threads which triggered issues with running out of resources (Metal resources in particular). This also re-enables two disabled unit tests for view background colour. Issue: flutter#124677 ## Pre-launch Checklist - [X] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [X] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [X] I read and followed the [Flutter Style Guide] and the [C++, Objective-C, Java style guides]. - [X] I listed at least one issue that this PR fixes in the description above. - [X] I added at least one completely unnecessary checkbox. - [X] J'ai ajouté une case à cocher dans une langue autre que l'anglais. - [X] I added new tests to check the change I am making or feature I am adding, or the PR is [test-exempt]. See [testing the engine] for instructions on writing and running engine tests. - [X] I updated/added relevant documentation (doc comments with `///`). - [X] I signed the [CLA]. - [X] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. <!-- Links --> [Contributor Guide]: https://github.com/flutter/flutter/wiki/Tree-hygiene#overview [Tree Hygiene]: https://github.com/flutter/flutter/wiki/Tree-hygiene [test-exempt]: https://github.com/flutter/flutter/wiki/Tree-hygiene#tests [Flutter Style Guide]: https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style [testing the engine]: https://github.com/flutter/flutter/wiki/Testing-the-engine [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/wiki/Tree-hygiene#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/wiki/Chat
1 parent 758aa0c commit ea4e1fb

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

shell/platform/darwin/macos/framework/Source/FlutterEngineTest.mm

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,7 @@ @implementation MockableFlutterEngine
222222
EXPECT_TRUE(stdout_capture.GetOutput().find("Hello logging") != std::string::npos);
223223
}
224224

225-
// TODO(cbracken): Needs deflaking. https://github.com/flutter/flutter/issues/124677
226-
TEST_F(FlutterEngineTest, DISABLED_BackgroundIsBlack) {
225+
TEST_F(FlutterEngineTest, BackgroundIsBlack) {
227226
FlutterEngine* engine = GetFlutterEngine();
228227

229228
// Latch to ensure the entire layer tree has been generated and presented.
@@ -252,8 +251,7 @@ @implementation MockableFlutterEngine
252251
latch.Wait();
253252
}
254253

255-
// TODO(cbracken): Needs deflaking. https://github.com/flutter/flutter/issues/124677
256-
TEST_F(FlutterEngineTest, DISABLED_CanOverrideBackgroundColor) {
254+
TEST_F(FlutterEngineTest, CanOverrideBackgroundColor) {
257255
FlutterEngine* engine = GetFlutterEngine();
258256

259257
// Latch to ensure the entire layer tree has been generated and presented.

shell/platform/darwin/macos/framework/Source/FlutterEngineTestUtils.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
namespace flutter::testing {
1717

18-
class FlutterEngineTest : public ::testing::Test {
18+
class FlutterEngineTest : public AutoreleasePoolTest {
1919
public:
2020
FlutterEngineTest();
2121

0 commit comments

Comments
 (0)