Revert "update Glob in the sdk, also adds package:file to the sdk"

sstrickl · commit-bot@chromium.org · commit ce614d33c432 · 2020-11-25T10:46:27.000Z
This reverts commit 18b19db. Reason for revert: Breaks Flutter 3H/Golem. Tried making an appropriate patch for 3H that would pull file into its dependencies (see https://dart-review.googlesource.com/c/sdk/+/173960/), but that still failed, so reverting. Original change's description: > update Glob in the sdk, also adds package:file to the sdk > > Change-Id: Ia8628c28bfaf6343c19eecfef391339968cd57e9 > Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/172063 > Commit-Queue: Jake Macdonald <jakemac@google.com> > Reviewed-by: Nate Bosch <nbosch@google.com> TBR=jakemac@google.com,nbosch@google.com Change-Id: I0616e3df7505f348edeefee40cbaf4adc59487cd No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/173963 Reviewed-by: Tess Strickland <sstrickl@google.com> Commit-Queue: Tess Strickland <sstrickl@google.com>
diff --git a/.dart_tool/package_config.json b/.dart_tool/package_config.json
@@ -257,12 +257,6 @@
       "packageUri": "lib/",
       "languageVersion": "2.12"
     },
-    {
-      "name": "file",
-      "rootUri": "../third_party/pkg/file/packages/file",
-      "packageUri": "lib/",
-      "languageVersion": "2.12"
-    },
     {
       "name": "fixnum",
       "rootUri": "../third_party/pkg/fixnum",
@@ -290,7 +284,7 @@
       "name": "glob",
       "rootUri": "../third_party/pkg/glob",
       "packageUri": "lib/",
-      "languageVersion": "2.12"
+      "languageVersion": "2.2"
     },
     {
       "name": "html",
diff --git a/DEPS b/DEPS
@@ -104,8 +104,7 @@ vars = {
   "dartdoc_rev" : "d79877d0764ce23ffea7055049f8da5dffce0308",
   "ffi_rev": "a5d4232cd38562c75a3ed847baa340e399538028",
   "fixnum_rev": "16d3890c6dc82ca629659da1934e412292508bba",
-  "file_rev": "0e09370f581ab6388d46fda4cdab66638c0171a1",
-  "glob_rev": "7c0ef8d4fa086f6b185c4dd724b700e7d7ad8f79",
+  "glob_rev": "e9f4e6b7ae8abe5071461cf8f47191bb19cf7ef6",
   "html_rev": "22f17e97fedeacaa1e945cf84d8016284eed33a6",
   "http_io_rev": "2fa188caf7937e313026557713f7feffedd4978b",
   "http_multi_server_rev" : "f1d1c9c024a293ab0a0e16f8b7632e87c708b448",
@@ -336,9 +335,6 @@ deps = {
       Var("dart_git") + "ffi.git" + "@" + Var("ffi_rev"),
   Var("dart_root") + "/third_party/pkg/fixnum":
       Var("dart_git") + "fixnum.git" + "@" + Var("fixnum_rev"),
-  Var("dart_root") + "/third_party/pkg/file":
-      Var("dart_git") + "external/github.com/google/file.dart/"
-      + "@" + Var("file_rev"),
   Var("dart_root") + "/third_party/pkg/glob":
       Var("dart_git") + "glob.git" + "@" + Var("glob_rev"),
   Var("dart_root") + "/third_party/pkg/html":
diff --git a/pkg/test_runner/lib/src/browser_controller.dart b/pkg/test_runner/lib/src/browser_controller.dart
@@ -298,8 +298,8 @@ class Safari extends Browser {
     // We run killAndResetSafari in a Zone as opposed to running an external
     // process. The Zone allows us to collect its output, and protect the rest
     // of the test infrastructure against errors in it.
-    runZonedGuarded(zoneWrapper, handleUncaughtError,
-        zoneSpecification: specification);
+    runZoned(zoneWrapper,
+        zoneSpecification: specification, onError: handleUncaughtError);
 
     try {
       await completer.future;
diff --git a/pkg/test_runner/lib/src/test_suite.dart b/pkg/test_runner/lib/src/test_suite.dart
@@ -862,6 +862,7 @@ class StandardTestSuite extends TestSuite {
 
     print("Cannot create URL for path $file. Not in build or dart directory.");
     exit(1);
+    throw "unreachable";
   }
 
   String _uriForBrowserTest(String pathComponent) {
diff --git a/pkg/test_runner/pubspec.yaml b/pkg/test_runner/pubspec.yaml
@@ -22,14 +22,10 @@ dependencies:
 dev_dependencies:
   expect:
     path: ../expect
-  file: any
-  glob: any
+  glob:
+    path: ../../third_party/pkg/glob    
 dependency_overrides:
   # Other packages in the dependency graph have normal hosted dependencies on
   # this, so just override it to force the local one.
   args:
     path: ../../third_party/pkg/args
-  file:
-    path: ../../third_party/pkg/file/packages/file
-  glob:
-    path: ../../third_party/pkg/glob
diff --git a/pkg/test_runner/tool/update_static_error_tests.dart b/pkg/test_runner/tool/update_static_error_tests.dart
@@ -7,9 +7,7 @@
 import 'dart:io';
 
 import 'package:args/args.dart';
-import 'package:file/file.dart' as pkg_file;
 import 'package:glob/glob.dart';
-import 'package:glob/list_local_fs.dart';
 import 'package:path/path.dart' as p;
 
 import 'package:test_runner/src/command_output.dart';
@@ -132,7 +130,7 @@ Future<void> main(List<String> args) async {
   for (var entry in glob.listSync(root: root)) {
     if (!entry.path.endsWith(".dart")) continue;
 
-    if (entry is pkg_file.File) {
+    if (entry is File) {
       await _processFile(entry,
           dryRun: dryRun,
           remove: removeSources,

Original file line number	Diff line number	Diff line change
`@@ -862,6 +862,7 @@ class StandardTestSuite extends TestSuite {`
`862`	`862`
`863`	`863`	`print("Cannot create URL for path $file. Not in build or dart directory.");`
`864`	`864`	`exit(1);`
	`865`	`+ throw "unreachable";`
`865`	`866`	`}`
`866`	`867`
`867`	`868`	`String _uriForBrowserTest(String pathComponent) {`