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
4ecb1bbe
Unverified
Commit
4ecb1bbe
authored
May 11, 2020
by
Jenn Magder
Committed by
GitHub
May 11, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add mirror overrides to doctor output (#56928)
parent
9c87b324
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
0 deletions
+27
-0
user_messages.dart
packages/flutter_tools/lib/src/base/user_messages.dart
+2
-0
doctor.dart
packages/flutter_tools/lib/src/doctor.dart
+6
-0
doctor_test.dart
...utter_tools/test/commands.shard/hermetic/doctor_test.dart
+19
-0
No files found.
packages/flutter_tools/lib/src/base/user_messages.dart
View file @
4ecb1bbe
...
...
@@ -22,6 +22,8 @@ class UserMessages {
'Framework revision
$revision
(
$age
),
$date
'
;
String
engineRevision
(
String
revision
)
=>
'Engine revision
$revision
'
;
String
dartRevision
(
String
revision
)
=>
'Dart version
$revision
'
;
String
pubMirrorURL
(
String
url
)
=>
'Pub download mirror
$url
'
;
String
flutterMirrorURL
(
String
url
)
=>
'Flutter download mirror
$url
'
;
String
get
flutterBinariesDoNotRun
=>
'Downloaded executables cannot execute on host.
\n
'
'See https://github.com/flutter/flutter/issues/6207 for more information'
;
...
...
packages/flutter_tools/lib/src/doctor.dart
View file @
4ecb1bbe
...
...
@@ -642,6 +642,12 @@ class FlutterValidator extends DoctorValidator {
)));
messages
.
add
(
ValidationMessage
(
userMessages
.
engineRevision
(
version
.
engineRevisionShort
)));
messages
.
add
(
ValidationMessage
(
userMessages
.
dartRevision
(
version
.
dartSdkVersion
)));
if
(
globals
.
platform
.
environment
.
containsKey
(
'PUB_HOSTED_URL'
))
{
messages
.
add
(
ValidationMessage
(
userMessages
.
pubMirrorURL
(
globals
.
platform
.
environment
[
'PUB_HOSTED_URL'
])));
}
if
(
globals
.
platform
.
environment
.
containsKey
(
'FLUTTER_STORAGE_BASE_URL'
))
{
messages
.
add
(
ValidationMessage
(
userMessages
.
flutterMirrorURL
(
globals
.
platform
.
environment
[
'FLUTTER_STORAGE_BASE_URL'
])));
}
}
on
VersionCheckError
catch
(
e
)
{
messages
.
add
(
ValidationMessage
.
error
(
e
.
message
));
valid
=
ValidationType
.
partial
;
...
...
packages/flutter_tools/test/commands.shard/hermetic/doctor_test.dart
View file @
4ecb1bbe
...
...
@@ -35,6 +35,7 @@ import '../../src/testbed.dart';
final
Generator
_kNoColorOutputPlatform
=
()
=>
FakePlatform
(
localeName:
'en_US.UTF-8'
,
environment:
<
String
,
String
>{},
stdoutSupportsAnsi:
false
,
);
...
...
@@ -588,6 +589,24 @@ void main() {
Platform:
_kNoColorOutputPlatform
,
FlutterVersion:
()
=>
mockFlutterVersion
,
});
testUsingContext
(
'shows mirrors'
,
()
async
{
(
globals
.
platform
as
FakePlatform
).
environment
=
<
String
,
String
>{
'PUB_HOSTED_URL'
:
'https://example.com/pub'
,
'FLUTTER_STORAGE_BASE_URL'
:
'https://example.com/flutter'
,
};
expect
(
await
FlutterValidatorDoctor
(
logger
).
diagnose
(
verbose:
true
),
isTrue
);
expect
(
logger
.
statusText
,
contains
(
'Pub download mirror https://example.com/pub'
));
expect
(
logger
.
statusText
,
contains
(
'Flutter download mirror https://example.com/flutter'
));
},
overrides:
<
Type
,
Generator
>{
Artifacts:
()
=>
mockArtifacts
,
FileSystem:
()
=>
memoryFileSystem
,
OutputPreferences:
()
=>
OutputPreferences
(
wrapText:
false
),
ProcessManager:
()
=>
mockProcessManager
,
Platform:
_kNoColorOutputPlatform
,
FlutterVersion:
()
=>
mockFlutterVersion
,
});
});
testUsingContext
(
'validate non-verbose output wrapping'
,
()
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