Repository navigation
[flutter_tools] Update WebAssetServer to avoid context, fix tests - #60224
Merged
Merged
Conversation
fluttergithubbot
added
the
tool
| ReleaseAssetServer(this.entrypoint); | ||
| ReleaseAssetServer(this.entrypoint, { | ||
| @required FileSystem fileSystem, | ||
| @required String webBuilDirectory, |
Contributor
There was a problem hiding this comment.
Suggested change
| @required String webBuilDirectory, | |
| @required String webBuildDirectory, |
| fileSystem: globals.fs, | ||
| platform: globals.platform, | ||
| flutterRoot: Cache.flutterRoot, | ||
| webBuilDirectory: getWebBuildDirectory(), |
Contributor
There was a problem hiding this comment.
Suggested change
| webBuilDirectory: getWebBuildDirectory(), | |
| webBuildDirectory: getWebBuildDirectory(), |
| }) : _fileSystem = fileSystem, | ||
| _platform = platform, | ||
| _flutterRoot = flutterRoot, | ||
| _webBuilDirectory = webBuilDirectory, |
Contributor
There was a problem hiding this comment.
Suggested change
| _webBuilDirectory = webBuilDirectory, | |
| _webBuildDirectory = webBuildDirectory, |
|
|
||
| final Uri entrypoint; | ||
| final String _flutterRoot; | ||
| final String _webBuilDirectory; |
Contributor
There was a problem hiding this comment.
Suggested change
| final String _webBuilDirectory; | |
| final String _webBuildDirectory; |
| globals.fs.currentDirectory.uri, | ||
| globals.fs.directory(globals.fsUtils.homeDirPath).uri, | ||
| List<Uri> _searchPaths() => <Uri>[ | ||
| _fileSystem.directory(_webBuilDirectory).uri, |
Contributor
There was a problem hiding this comment.
Suggested change
| _fileSystem.directory(_webBuilDirectory).uri, | |
| _fileSystem.directory(_webBuildDirectory).uri, |
| } | ||
| if (request.url.path == '') { | ||
| final File file = globals.fs.file(globals.fs.path.join(getWebBuildDirectory(), 'index.html')); | ||
| final File file = _fileSystem.file(_fileSystem.path.join(_webBuilDirectory, 'index.html')); |
Contributor
There was a problem hiding this comment.
Suggested change
| final File file = _fileSystem.file(_fileSystem.path.join(_webBuilDirectory, 'index.html')); | |
| final File file = _fileSystem.file(_fileSystem.path.join(_webBuildDirectory, 'index.html')); |
| }, overrides: <Type, Generator>{ | ||
| FileSystem: () => fileSystem, | ||
| Platform: () => platform, | ||
| ProcessManager: () => FakeProcessManager.any(), |
Contributor
There was a problem hiding this comment.
was the process manager never getting called?
Contributor
There was a problem hiding this comment.
I guess not, since these are now testWithoutContext. cool.
Contributor
Author
There was a problem hiding this comment.
Negatory, but we have a rule that a context injected FIleSystem requires a context Injected ProcessManager
christopherfujino
approved these changes
Jun 24, 2020
christopherfujino
left a comment
christopherfujino
left a comment
Contributor
There was a problem hiding this comment.
LGTM once the analyzer verifies all the spelling changes are consistent.
Contributor
Author
|
Almost! Sorry I didn't accept the suggestions, that seems to trip up the CLA bot |
Contributor
Not offended at all. It's probably easier to do locally anyway. |
|
Started Google testing for this PR |
|
Google testing passed! |
mingwandroid
pushed a commit
to mingwandroid/flutter
that referenced
this pull request
Sep 6, 2020
…utter#60224) WebAssetServer could fail if some of the global statics it depended on were initialized in a different order. Fix this by removing globals. Delete dwds startup test that needs to spawn a real server.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
WebAssetServer could fail if some of the global statics it depended on were initialized in a different order. Fix this by removing globals.
Delete dwds startup test that needs to spawn a real server.