[autoroll] make autoroller propagate changes to recipes.py.

unittests/repo_test_util.py

Index: unittests/repo_test_util.py
diff --git a/unittests/repo_test_util.py b/unittests/repo_test_util.py
index 3f3795ecdd668b0eccabf80e8dc5a410da1c5263..271d2fb691b1f9eb5745b75ebfbd787892823614 100644
--- a/unittests/repo_test_util.py
+++ b/unittests/repo_test_util.py
@@ -89,11 +89,18 @@ class RepoTest(unittest.TestCase):
       subprocess.check_output(['git', 'init'])
       subprocess.check_output(['git', 'remote', 'add', 'origin', repo_dir])
       with open('recipes.py', 'w') as f:
-        f.write('import subprocess, sys\n'
-                'sys.exit(subprocess.call(\n'
-                '    [sys.executable, %r, "--package", %r] + sys.argv[1:]))' % (
-                    self._recipe_tool,
-                    os.path.join(repo_dir, 'infra', 'config', 'recipes.cfg')))
+        f.write('\n'.join([
+          'import subprocess, sys, os',
+          '#### PER-REPO CONFIGURATION (editable) ####',
+          'REPO_ROOT = "."',
+          'RECIPES_CFG = os.path.join("infra", "config", "recipes.cfg")',
+          '#### END PER-REPO CONFIGURATION ####',
+          'if sys.argv[1] != "fetch":',
+          '  sys.exit(subprocess.call(',
+          '      [sys.executable, %r, "--package", %r] + sys.argv[1:]))' % (
+            self._recipe_tool,
+            os.path.join(repo_dir, 'infra', 'config', 'recipes.cfg')),

[iannucci, 2017/03/16 05:19:55]

This changed because we now assume that the recipes.py file has a bit more
smarts in it. This is now the minimal assumed recipes.py file.

[Paweł Hajdan Jr., 2017/03/16 16:29:22]

Consider adding a test for how things behave if expected lines are not present.

[iannucci, 2017/03/19 17:39:02]

Done.

+        ]))
       subprocess.check_output(['git', 'add', 'recipes.py'])
     rev = self.update_recipes_cfg(name, spec)
     return {