From adc54302cb6455442ca0de4e1683f8217cd12f09 Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Fri, 10 Feb 2017 16:23:44 -0800
Subject: [PATCH] test: make integration test more reliable (#14413)

Use a fresh yarn cache
tsickle bugfix to write case-sensitive filenames for Mac
---
 integration/run_tests.sh  | 12 +++++++++++-
 npm-shrinkwrap.clean.json | 12 +++---------
 npm-shrinkwrap.json       | 18 +++++-------------
 3 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/integration/run_tests.sh b/integration/run_tests.sh
index b831638833..1165f75ef1 100755
--- a/integration/run_tests.sh
+++ b/integration/run_tests.sh
@@ -16,6 +16,16 @@ if [ ! -d "../dist/packages-dist-es2015" ]; then
   exit 1
 fi
 
+# Workaround https://github.com/yarnpkg/yarn/issues/2165
+# Yarn will cache file://dist URIs and not update Angular code
+readonly cache=.yarn_local_cache
+function rm_cache {
+  rm -rf $cache
+}
+rm_cache
+mkdir $cache
+trap rm_cache EXIT
+
 for testDir in $(ls | grep -v rxjs | grep -v node_modules) ; do
   [[ -d "$testDir" ]] || continue
   echo "#################################"
@@ -25,7 +35,7 @@ for testDir in $(ls | grep -v rxjs | grep -v node_modules) ; do
     cd $testDir
     # Workaround for https://github.com/yarnpkg/yarn/issues/2256
     rm -f yarn.lock
-    yarn
+    yarn install --cache-folder ../$cache
     yarn test || exit 1
   )
 done
diff --git a/npm-shrinkwrap.clean.json b/npm-shrinkwrap.clean.json
index 8598807774..08b07dffb5 100644
--- a/npm-shrinkwrap.clean.json
+++ b/npm-shrinkwrap.clean.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-srcs",
-  "version": "4.0.0-beta.6",
+  "version": "4.0.0-beta.7",
   "dependencies": {
     "@types/angularjs": {
       "version": "1.5.13-alpha",
@@ -6160,14 +6160,8 @@
       }
     },
     "tsickle": {
-      "version": "0.21.1",
-      "dev": true,
-      "dependencies": {
-        "source-map": {
-          "version": "0.5.6",
-          "dev": true
-        }
-      }
+      "version": "0.21.2",
+      "dev": true
     },
     "tslint": {
       "version": "4.1.1",
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index a1701cf13d..0ad2e73796 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-srcs",
-  "version": "4.0.0-beta.6",
+  "version": "4.0.0-beta.7",
   "dependencies": {
     "@types/angularjs": {
       "version": "1.5.13-alpha",
@@ -9008,18 +9008,10 @@
       }
     },
     "tsickle": {
-      "version": "0.21.1",
-      "from": "tsickle@0.21.1",
-      "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.21.1.tgz",
-      "dev": true,
-      "dependencies": {
-        "source-map": {
-          "version": "0.5.6",
-          "from": "source-map@>=0.5.6 <0.6.0",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-          "dev": true
-        }
-      }
+      "version": "0.21.2",
+      "from": "tsickle@0.21.2",
+      "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.21.2.tgz",
+      "dev": true
     },
     "tslint": {
       "version": "4.1.1",