Skip to content

Commit e9519d8

Browse files
Restore Cache.flutterRoot after overriding it in a test (flutter#93555)
Fixes flutter#93553
1 parent b810aa7 commit e9519d8

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

packages/flutter_tools/test/general.shard/cache_test.dart

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -929,18 +929,23 @@ void main() {
929929
});
930930

931931
testUsingContext('AndroidMavenArtifacts can invoke Gradle resolve dependencies if Android SDK is present', () async {
932+
final String oldRoot = Cache.flutterRoot;
932933
Cache.flutterRoot = '';
933-
final AndroidMavenArtifacts mavenArtifacts = AndroidMavenArtifacts(cache, platform: FakePlatform());
934-
expect(await mavenArtifacts.isUpToDate(memoryFileSystem), isFalse);
934+
try {
935+
final AndroidMavenArtifacts mavenArtifacts = AndroidMavenArtifacts(cache, platform: FakePlatform());
936+
expect(await mavenArtifacts.isUpToDate(memoryFileSystem), isFalse);
935937

936-
final Directory gradleWrapperDir = cache.getArtifactDirectory('gradle_wrapper')..createSync(recursive: true);
937-
gradleWrapperDir.childFile('gradlew').writeAsStringSync('irrelevant');
938-
gradleWrapperDir.childFile('gradlew.bat').writeAsStringSync('irrelevant');
938+
final Directory gradleWrapperDir = cache.getArtifactDirectory('gradle_wrapper')..createSync(recursive: true);
939+
gradleWrapperDir.childFile('gradlew').writeAsStringSync('irrelevant');
940+
gradleWrapperDir.childFile('gradlew.bat').writeAsStringSync('irrelevant');
939941

940-
await mavenArtifacts.update(FakeArtifactUpdater(), BufferLogger.test(), memoryFileSystem, FakeOperatingSystemUtils());
942+
await mavenArtifacts.update(FakeArtifactUpdater(), BufferLogger.test(), memoryFileSystem, FakeOperatingSystemUtils());
941943

942-
expect(await mavenArtifacts.isUpToDate(memoryFileSystem), isFalse);
943-
expect(fakeAndroidSdk.reinitialized, true);
944+
expect(await mavenArtifacts.isUpToDate(memoryFileSystem), isFalse);
945+
expect(fakeAndroidSdk.reinitialized, true);
946+
} finally {
947+
Cache.flutterRoot = oldRoot;
948+
}
944949
}, overrides: <Type, Generator>{
945950
Cache: () => cache,
946951
FileSystem: () => memoryFileSystem,

0 commit comments

Comments
 (0)