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
2c898f68
Unverified
Commit
2c898f68
authored
Mar 29, 2018
by
Todd Volkert
Committed by
GitHub
Mar 29, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove writelnStderr (#16058)
Paying off technical debt...
parent
cab8242f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
63 additions
and
27 deletions
+63
-27
runner.dart
packages/flutter_tools/lib/runner.dart
+14
-25
crash_reporting_test.dart
packages/flutter_tools/test/crash_reporting_test.dart
+49
-2
No files found.
packages/flutter_tools/lib/runner.dart
View file @
2c898f68
...
...
@@ -61,17 +61,6 @@ Future<int> run(
});
}
/// Writes the [string] to one of the standard output streams.
@visibleForTesting
typedef
void
WriteCallback
(
[
String
string
]);
/// Writes a line to STDERR.
///
/// Overwrite this in tests to avoid spurious test output.
// TODO(tvolkert): Remove this in favor of context[Stdio]
@visibleForTesting
WriteCallback
writelnStderr
=
stderr
.
writeln
;
Future
<
int
>
_handleToolError
(
dynamic
error
,
StackTrace
stackTrace
,
...
...
@@ -81,9 +70,9 @@ Future<int> _handleToolError(
String
getFlutterVersion
(),
)
async
{
if
(
error
is
UsageException
)
{
writelnStderr
(
error
.
message
);
writelnStderr
();
writelnStderr
(
stderr
.
writeln
(
error
.
message
);
stderr
.
writeln
();
stderr
.
writeln
(
"Run 'flutter -h' (or 'flutter <command> -h') for available "
'flutter commands and options.'
);
...
...
@@ -91,11 +80,11 @@ Future<int> _handleToolError(
return
_exit
(
64
);
}
else
if
(
error
is
ToolExit
)
{
if
(
error
.
message
!=
null
)
writelnStderr
(
error
.
message
);
stderr
.
writeln
(
error
.
message
);
if
(
verbose
)
{
writelnStderr
();
writelnStderr
(
stackTrace
.
toString
());
writelnStderr
();
stderr
.
writeln
();
stderr
.
writeln
(
stackTrace
.
toString
());
stderr
.
writeln
();
}
return
_exit
(
error
.
exitCode
??
1
);
}
else
if
(
error
is
ProcessExit
)
{
...
...
@@ -108,20 +97,20 @@ Future<int> _handleToolError(
}
}
else
{
// We've crashed; emit a log report.
writelnStderr
();
stderr
.
writeln
();
if
(!
reportCrashes
)
{
// Print the stack trace on the bots - don't write a crash report.
writelnStderr
(
'
$error
'
);
writelnStderr
(
stackTrace
.
toString
());
stderr
.
writeln
(
'
$error
'
);
stderr
.
writeln
(
stackTrace
.
toString
());
return
_exit
(
1
);
}
else
{
flutterUsage
.
sendException
(
error
,
stackTrace
);
if
(
error
is
String
)
writelnStderr
(
'Oops; flutter has exited unexpectedly: "
$error
".'
);
stderr
.
writeln
(
'Oops; flutter has exited unexpectedly: "
$error
".'
);
else
writelnStderr
(
'Oops; flutter has exited unexpectedly.'
);
stderr
.
writeln
(
'Oops; flutter has exited unexpectedly.'
);
await
CrashReportSender
.
instance
.
sendReport
(
error:
error
,
...
...
@@ -130,13 +119,13 @@ Future<int> _handleToolError(
);
try
{
final
File
file
=
await
_createLocalCrashReport
(
args
,
error
,
stackTrace
);
writelnStderr
(
stderr
.
writeln
(
'Crash report written to
${file.path}
;
\n
'
'please let us know at https://github.com/flutter/flutter/issues.'
,
);
return
_exit
(
1
);
}
catch
(
error
)
{
writelnStderr
(
stderr
.
writeln
(
'Unable to generate crash report due to secondary error:
$error
\n
'
'please let us know at https://github.com/flutter/flutter/issues.'
,
);
...
...
packages/flutter_tools/test/crash_reporting_test.dart
View file @
2c898f68
...
...
@@ -30,13 +30,11 @@ void main() {
setUp
(()
async
{
tools
.
crashFileSystem
=
new
MemoryFileSystem
();
tools
.
writelnStderr
=
([
_
])
{
};
setExitFunctionForTests
((
_
)
{
});
});
tearDown
(()
{
tools
.
crashFileSystem
=
const
LocalFileSystem
();
tools
.
writelnStderr
=
const
Stdio
().
stderr
.
writeln
;
restoreExitFunction
();
});
...
...
@@ -119,6 +117,8 @@ void main() {
.
map
((
FileSystemEntity
e
)
=>
e
.
path
).
toList
();
expect
(
writtenFiles
,
hasLength
(
1
));
expect
(
writtenFiles
,
contains
(
'flutter_01.log'
));
},
overrides:
<
Type
,
Generator
>{
Stdio:
()
=>
const
_NoStderr
(),
});
});
}
...
...
@@ -149,3 +149,50 @@ class _CrashCommand extends FlutterCommand {
fn3
();
}
}
class
_NoStderr
extends
Stdio
{
const
_NoStderr
();
@override
IOSink
get
stderr
=>
const
_NoopIOSink
();
}
class
_NoopIOSink
implements
IOSink
{
const
_NoopIOSink
();
@override
Encoding
get
encoding
=>
utf8
;
@override
set
encoding
(
_
)
=>
throw
new
UnsupportedError
(
''
);
@override
void
add
(
_
)
{}
@override
void
write
(
_
)
{}
@override
void
writeAll
(
_
,
[
__
])
{}
@override
void
writeln
([
_
])
{}
@override
void
writeCharCode
(
_
)
{}
@override
void
addError
(
_
,
[
__
])
{}
@override
Future
<
dynamic
>
addStream
(
_
)
async
{}
@override
Future
<
dynamic
>
flush
()
async
{}
@override
Future
<
dynamic
>
close
()
async
{}
@override
Future
<
dynamic
>
get
done
async
{}
}
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