commit 64c51641ad1d4f6c2adb2f3410d1d08672366c80
author Godofredo Contreras <godofredoc@google.com> Wed May 13 04:23:57 2020 +0000
committer Godofredo Contreras <godofredoc@google.com> Wed May 13 04:23:57 2020 +0000
tree 1df6e5e6e0406a2d9281352dbff6229419e72080
parent 37f72ef926a2913ce0e4ef97cc8774dd6f3b0965

Fix recipes unit test.

When the recipes are running from cq the additional recipes folder was not being created.

Change-Id: I7e380889d915f65014ff0906ac2569e6a251aa77
Bug: https://github.com/flutter/flutter/issues/57068
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/2824
Reviewed-by: Godofredo Contreras <godofredoc@google.com>

recipes/recipes.expected/cq_try.json

diff --git a/recipes/recipes.expected/cq_try.json b/recipes/recipes.expected/cq_try.json
index b62c131..d89e55e 100644
--- a/recipes/recipes.expected/cq_try.json
+++ b/recipes/recipes.expected/cq_try.json
@@ -308,7 +308,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]"
+      "[START_DIR]/recipes"
     ],
     "infra_step": true,
     "name": "makedirs"
@@ -316,13 +316,16 @@
   {
     "cmd": [
       "git",
-      "init"
+      "config",
+      "--remove-section",
+      "remote.origin"
     ],
+    "cwd": "[START_DIR]/recipes",
     "env": {
       "GIT_HTTP_LOW_SPEED_LIMIT": "2048000",
       "GIT_HTTP_LOW_SPEED_TIME": "60"
     },
-    "name": "git init"
+    "name": "git config"
   },
   {
     "cmd": [
@@ -332,6 +335,7 @@
       "origin",
       "https://flutter.googlesource.com/recipes"
     ],
+    "cwd": "[START_DIR]/recipes",
     "env": {
       "GIT_HTTP_LOW_SPEED_LIMIT": "2048000",
       "GIT_HTTP_LOW_SPEED_TIME": "60"
@@ -354,6 +358,7 @@
       "0777",
       "[CACHE]/git/flutter.googlesource.com-recipes"
     ],
+    "cwd": "[START_DIR]/recipes",
     "infra_step": true,
     "name": "cache.makedirs",
     "~followup_annotations": [
@@ -440,8 +445,9 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/.git/objects/info"
+      "[START_DIR]/recipes/.git/objects/info"
     ],
+    "cwd": "[START_DIR]/recipes",
     "infra_step": true,
     "name": "cache.makedirs object/info",
     "~followup_annotations": [
@@ -457,8 +463,9 @@
       "/path/to/tmp/json",
       "copy",
       "[CACHE]/git/flutter.googlesource.com-recipes/objects\n",
-      "[START_DIR]/.git/objects/info/alternates"
+      "[START_DIR]/recipes/.git/objects/info/alternates"
     ],
+    "cwd": "[START_DIR]/recipes",
     "infra_step": true,
     "name": "cache.alternates",
     "~followup_annotations": [
@@ -475,6 +482,7 @@
       "origin",
       "refs/changes/56/123456/7"
     ],
+    "cwd": "[START_DIR]/recipes",
     "env": {
       "GIT_HTTP_LOW_SPEED_LIMIT": "2048000",
       "GIT_HTTP_LOW_SPEED_TIME": "60"
@@ -488,6 +496,7 @@
       "-f",
       "FETCH_HEAD"
     ],
+    "cwd": "[START_DIR]/recipes",
     "env": {
       "GIT_HTTP_LOW_SPEED_LIMIT": "2048000",
       "GIT_HTTP_LOW_SPEED_TIME": "60"
@@ -500,6 +509,7 @@
       "rev-parse",
       "HEAD"
     ],
+    "cwd": "[START_DIR]/recipes",
     "env": {
       "GIT_HTTP_LOW_SPEED_LIMIT": "2048000",
       "GIT_HTTP_LOW_SPEED_TIME": "60"
@@ -514,6 +524,7 @@
       "-d",
       "-x"
     ],
+    "cwd": "[START_DIR]/recipes",
     "env": {
       "GIT_HTTP_LOW_SPEED_LIMIT": "2048000",
       "GIT_HTTP_LOW_SPEED_TIME": "60"
@@ -530,6 +541,7 @@
       "submodule",
       "sync"
     ],
+    "cwd": "[START_DIR]/recipes",
     "env": {
       "GIT_HTTP_LOW_SPEED_LIMIT": "2048000",
       "GIT_HTTP_LOW_SPEED_TIME": "60"
@@ -546,6 +558,7 @@
       "update",
       "--init"
     ],
+    "cwd": "[START_DIR]/recipes",
     "env": {
       "GIT_HTTP_LOW_SPEED_LIMIT": "2048000",
       "GIT_HTTP_LOW_SPEED_TIME": "60"
@@ -561,6 +574,7 @@
       "rebase",
       "deadbeef"
     ],
+    "cwd": "[START_DIR]/recipes",
     "env": {
       "GIT_HTTP_LOW_SPEED_LIMIT": "2048000",
       "GIT_HTTP_LOW_SPEED_TIME": "60"

recipes/recipes.py

diff --git a/recipes/recipes.py b/recipes/recipes.py
index 0bdebdf..97488bb 100644
--- a/recipes/recipes.py
+++ b/recipes/recipes.py
@@ -95,12 +95,12 @@
 
 
 def RunSteps(api, remote, unittest_only):
+  checkout_path = api.path['start_dir'].join('recipes')
   bb_input = api.buildbucket.build.input
   if bb_input.gerrit_changes:
-    api.git.checkout_cl(bb_input.gerrit_changes[0], api.path['start_dir'])
+    api.git.checkout_cl(bb_input.gerrit_changes[0], checkout_path)
   else:
     api.git.checkout(remote)
-  checkout_path = api.path['start_dir'].join('recipes')
   api.recipe_testing.project = 'flutter'
   api.recipe_testing.run_lint(checkout_path)
   api.recipe_testing.run_unit_tests(checkout_path)