Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
0dc80621
Unverified
Commit
0dc80621
authored
Dec 16, 2020
by
Sam Rawlins
Committed by
GitHub
Dec 16, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Return null instead of empty in Future.catchError callbacks (#72409)
parent
a3971153
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
flutter_web_platform.dart
...ages/flutter_tools/lib/src/test/flutter_web_platform.dart
+2
-2
test_driver.dart
...ges/flutter_tools/test/integration.shard/test_driver.dart
+4
-1
No files found.
packages/flutter_tools/lib/src/test/flutter_web_platform.dart
View file @
0dc80621
...
...
@@ -618,7 +618,7 @@ class BrowserManager {
throwToolExit
(
'
${runtime.name}
exited with code
$browserExitCode
before connecting.'
);
}).
catchError
((
dynamic
error
,
StackTrace
stackTrace
)
{
if
(
completer
.
isCompleted
)
{
return
;
return
null
;
}
completer
.
completeError
(
error
,
stackTrace
);
}));
...
...
@@ -630,7 +630,7 @@ class BrowserManager {
}).
catchError
((
dynamic
error
,
StackTrace
stackTrace
)
{
chrome
.
close
();
if
(
completer
.
isCompleted
)
{
return
;
return
null
;
}
completer
.
completeError
(
error
,
stackTrace
);
}));
...
...
packages/flutter_tools/test/integration.shard/test_driver.dart
View file @
0dc80621
...
...
@@ -179,7 +179,10 @@ abstract class FlutterTestDriver {
// it forcefully and it won't terminate child processes, so we need to ensure
// it's running before terminating.
await
resume
().
timeout
(
defaultTimeout
)
.
catchError
((
Object
e
)
=>
_debugPrint
(
'Ignoring failure to resume during shutdown'
));
.
catchError
((
Object
e
)
{
_debugPrint
(
'Ignoring failure to resume during shutdown'
);
return
null
;
});
_debugPrint
(
'Sending SIGTERM to
$_processPid
..'
);
io
.
Process
.
killPid
(
_processPid
,
io
.
ProcessSignal
.
sigterm
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment