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
b54bb6ab
Unverified
Commit
b54bb6ab
authored
Nov 22, 2019
by
Jonah Williams
Committed by
GitHub
Nov 22, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Dont crash if the tool cannot delete asset directory during debugging (#45407)
parent
35b571cc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
1 deletion
+29
-1
bundle.dart
packages/flutter_tools/lib/src/bundle.dart
+11
-1
asset_bundle_test.dart
...s/flutter_tools/test/general.shard/asset_bundle_test.dart
+18
-0
No files found.
packages/flutter_tools/lib/src/bundle.dart
View file @
b54bb6ab
...
...
@@ -10,6 +10,7 @@ import 'package:pool/pool.dart';
import
'asset.dart'
;
import
'base/common.dart'
;
import
'base/file_system.dart'
;
import
'base/logger.dart'
;
import
'build_info.dart'
;
import
'build_system/build_system.dart'
;
import
'build_system/depfile.dart'
;
...
...
@@ -173,9 +174,18 @@ Future<AssetBundle> buildAssets({
Future
<
void
>
writeBundle
(
Directory
bundleDir
,
Map
<
String
,
DevFSContent
>
assetEntries
,
{
Logger
loggerOverride
}
)
async
{
loggerOverride
??=
logger
;
if
(
bundleDir
.
existsSync
())
{
bundleDir
.
deleteSync
(
recursive:
true
);
try
{
bundleDir
.
deleteSync
(
recursive:
true
);
}
on
FileSystemException
catch
(
err
)
{
loggerOverride
.
printError
(
'Failed to clean up asset directory
${bundleDir.path}
:
$err
\n
'
'To clean build artifacts, use the command "flutter clean".'
);
}
}
bundleDir
.
createSync
(
recursive:
true
);
...
...
packages/flutter_tools/test/general.shard/asset_bundle_test.dart
View file @
b54bb6ab
...
...
@@ -9,8 +9,12 @@ import 'package:file/memory.dart';
import
'package:flutter_tools/src/asset.dart'
;
import
'package:flutter_tools/src/base/file_system.dart'
;
import
'package:flutter_tools/src/base/logger.dart'
;
import
'package:flutter_tools/src/base/platform.dart'
;
import
'package:flutter_tools/src/bundle.dart'
;
import
'package:flutter_tools/src/cache.dart'
;
import
'package:flutter_tools/src/devfs.dart'
;
import
'package:mockito/mockito.dart'
;
import
'../src/common.dart'
;
import
'../src/context.dart'
;
...
...
@@ -179,4 +183,18 @@ flutter:
});
});
test
(
'Failed directory delete shows message'
,
()
async
{
final
MockDirectory
mockDirectory
=
MockDirectory
();
final
BufferLogger
bufferLogger
=
BufferLogger
();
when
(
mockDirectory
.
existsSync
()).
thenReturn
(
true
);
when
(
mockDirectory
.
deleteSync
(
recursive:
true
)).
thenThrow
(
const
FileSystemException
(
'ABCD'
));
await
writeBundle
(
mockDirectory
,
<
String
,
DevFSContent
>{},
loggerOverride:
bufferLogger
);
verify
(
mockDirectory
.
createSync
(
recursive:
true
)).
called
(
1
);
expect
(
bufferLogger
.
errorText
,
contains
(
'ABCD'
));
});
}
class
MockDirectory
extends
Mock
implements
Directory
{}
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