From dcd58ff56397a0899d7910db63d56ca094099f50 Mon Sep 17 00:00:00 2001
From: William Hesse <whesse@google.com>
Date: Tue, 17 Jul 2018 12:18:48 +0000
Subject: [PATCH] Update unittest to 0.11.x. Check out unittest from
 chromium.googlesource.

Change-Id: I35fbf7d18cf596c23fcdc9c702cc1a6d498a4691
Reviewed-on: https://dart-review.googlesource.com/65320
Reviewed-by: Lasse R.H. Nielsen <lrn@google.com>
Commit-Queue: William Hesse <whesse@google.com>
---
 DEPS                                 | 23 +++++++----------------
 third_party/pkg/unittest.tar.gz.sha1 |  1 -
 2 files changed, 7 insertions(+), 17 deletions(-)
 delete mode 100644 third_party/pkg/unittest.tar.gz.sha1

diff --git a/DEPS b/DEPS
index 84c167105eb..21df3964015 100644
--- a/DEPS
+++ b/DEPS
@@ -135,6 +135,7 @@ vars = {
   "test_tag": "1.0.0",
   "tuple_tag": "v1.0.1",
   "typed_data_tag": "1.1.3",
+  "unittest_rev": "2b8375bc98bb9dc81c539c91aaea6adce12e1072",
   "usage_tag": "3.4.0",
   "utf_tag": "0.9.0+4",
   "watcher_rev": "908d74c6ed0889fa9bd7939c72bcc287e4f581fd",
@@ -346,6 +347,12 @@ deps = {
       Var("dart_git") + "tuple.git" + "@" + Var("tuple_tag"),
   Var("dart_root") + "/third_party/pkg/typed_data":
       Var("dart_git") + "typed_data.git" + "@" + Var("typed_data_tag"),
+  # Unittest is an early version, 0.11.x, of the package "test"
+  # Do not use it in any new tests. Fetched from chromium_git to avoid
+  # race condition in cache with pkg/test.
+  Var("dart_root") + "/third_party/pkg/unittest":
+      Var("chromium_git") + "/external/github.com/dart-lang/test.git" +
+      "@" + Var("unittest_rev"),
   Var("dart_root") + "/third_party/pkg/usage":
       Var("dart_git") + "usage.git" + "@" + Var("usage_tag"),
   Var("dart_root") + "/third_party/pkg/utf":
@@ -414,22 +421,6 @@ hooks = [
       Var('dart_root') + "/third_party/drt_resources",
     ],
   },
-  {
-    "name": "unittest",
-    # Unittest is an early version, 0.11.6, of the package "test"
-    # Do not use it in any new tests.
-    "pattern": ".",
-    "action": [
-      "download_from_google_storage",
-      "--no_auth",
-      "--no_resume",
-      "--bucket",
-      "dart-dependencies",
-      "--extract",
-      "-s",
-      Var('dart_root') + "/third_party/pkg/unittest.tar.gz.sha1",
-    ],
-  },
   {
     "name": "7zip",
     "pattern": ".",
diff --git a/third_party/pkg/unittest.tar.gz.sha1 b/third_party/pkg/unittest.tar.gz.sha1
deleted file mode 100644
index 08c01a5b8ff..00000000000
--- a/third_party/pkg/unittest.tar.gz.sha1
+++ /dev/null
@@ -1 +0,0 @@
-f59bbc8788aa01618a5b7f143ef7c82068c86b0f
\ No newline at end of file