commit 950e41a5a9c532a78ac6ac3383f16392e09b872b
author Peter Mayo <petermayo@chromium.org> Thu Feb 06 21:07:33 2014 +0000
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Sat Feb 08 14:02:45 2014 +0000
tree 3ba3a3eda3352cd36560c68573e42fdcdee8ef2a
parent 9facf9256ef4400d68e05a533c979ce35d1c0b47

Revert "Add preference of private overlays for finding ACLs"

This reverts commit 7e4605f3b2285d27e73f9baff7507bb75ae6b9d5.

As it was broken.  A larger discussion is desired.

Change-Id: I3bc752d9bca52e9f1270d1c78a2986548366de0e
Reviewed-on: https://chromium-review.googlesource.com/185147
Tested-by: Peter Mayo <petermayo@chromium.org>
Reviewed-by: Peter Mayo <petermayo@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>

scripts/upload_prebuilts_unittest.py

diff --git a/scripts/upload_prebuilts_unittest.py b/scripts/upload_prebuilts_unittest.py
index 6924674..072f02d 100755
--- a/scripts/upload_prebuilts_unittest.py
+++ b/scripts/upload_prebuilts_unittest.py
@@ -415,8 +415,7 @@
     self.mox.StubOutWithMock(prebuilt, 'GetBoardOverlay')
     fake_overlay_path = '/fake_path'
     prebuilt.GetBoardOverlay(
-        options.build_path, options.board, mox.IgnoreArg()).AndReturn(
-        fake_overlay_path)
+        options.build_path, options.board).AndReturn(fake_overlay_path)
     expected_gs_acl_path = os.path.join(fake_overlay_path,
                                         prebuilt._GOOGLESTORAGE_ACL_FILE)
     prebuilt.PrebuiltUploader.__init__(options.upload, expected_gs_acl_path,