commit 9a495272408e0a193c3f79b324402fa9ce1551e1
author Jens Johansen <jensj@google.com> Wed May 18 12:46:07 2022 +0000
committer Commit Bot <commit-bot@chromium.org> Wed May 18 12:46:07 2022 +0000
tree eea232fc2e9851c8ca03adbd52d6e62d0b5a9ae1
parent f0f1629e20e67f43eb62b4ceecd03e8eca4243fd

[CFE] Fix flutter_gallery_leak_tester after no .packages

This caused flutter gallery leak_tests to fail on the weekly bot.

Change-Id: I12a51e98574a9403fb4cd0c2a3f8ce96fdfda887
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/245005
Commit-Queue: Jens Johansen <jensj@google.com>
Reviewed-by: Johnni Winther <johnniwinther@google.com>

pkg/front_end/test/flutter_gallery_leak_tester.dart

diff --git a/pkg/front_end/test/flutter_gallery_leak_tester.dart b/pkg/front_end/test/flutter_gallery_leak_tester.dart
index 84fe990..d7e9630 100644
--- a/pkg/front_end/test/flutter_gallery_leak_tester.dart
+++ b/pkg/front_end/test/flutter_gallery_leak_tester.dart
@@ -111,20 +111,13 @@
         ".pub-cache/hosted/pub.dartlang.org/");
     Directory pubDir = new Directory.fromUri(pubDirUri);
     if (!pubDir.existsSync()) throw "Expected to find $pubDir";
-    File galleryDotPackages = new File("$rootPath/gallery/.packages");
-    if (!galleryDotPackages.existsSync()) {
-      throw "Didn't find $galleryDotPackages";
-    }
-    String data = galleryDotPackages.readAsStringSync();
-    data = data.replaceAll(pubDirUri.toString(), "pub/");
-    galleryDotPackages.writeAsStringSync(data);
 
     File galleryPackageConfig =
         new File("$rootPath/gallery/.dart_tool/package_config.json");
     if (!galleryPackageConfig.existsSync()) {
       throw "Didn't find $galleryPackageConfig";
     }
-    data = galleryPackageConfig.readAsStringSync();
+    String data = galleryPackageConfig.readAsStringSync();
     data = data.replaceAll(pubDirUri.toString(), "../pub/");
     galleryPackageConfig.writeAsStringSync(data);
 
@@ -146,9 +139,10 @@
     print("Exit code from ln: $processExitCode");
   }
 
-  File galleryDotPackages = new File("$rootPath/gallery/.packages");
-  if (!galleryDotPackages.existsSync()) {
-    throw "Didn't find $galleryDotPackages";
+  File packageConfig =
+      new File("$rootPath/gallery/.dart_tool/package_config.json");
+  if (!packageConfig.existsSync()) {
+    throw "Didn't find $packageConfig";
   }
 
   List<helper.Interest> interests = <helper.Interest>[];