commit c4e878447bbb01c6afd8739a740ebe75be1fb6eb
author Chris Sosa <sosa@chromium.org> Fri Aug 16 18:04:14 2013 -0700
committer Chris Sosa <sosa@chromium.org> Fri Aug 16 18:10:26 2013 -0700
tree 75bee66f1daa5ae6442076b135a0aeb0905805c1
parent cb4302280d0a0d4d49ace2d21b749b98aa3b567b

Fix bug with WaitForArtifacts that has a side-effect that didn't matter before.

Async broke the assumption that WaitForArtifacts would only be called once.
Make the side-effect optional.

BUG=chromium:274824
TEST=Ran stage of deltas with async=True and is_synced etc + unittests.

Change-Id: I012385fe1cbeadffb7ae283051aad502576a7325
Reviewed-on: https://gerrit.chromium.org/gerrit/66149
Reviewed-by: Alex Miller <milleral@chromium.org>
Reviewed-by: Chris Sosa <sosa@chromium.org>
Tested-by: Chris Sosa <sosa@chromium.org>

autoupdate_unittest.py

diff --git a/autoupdate_unittest.py b/autoupdate_unittest.py
index 72d583e..9fe04b5 100755
--- a/autoupdate_unittest.py
+++ b/autoupdate_unittest.py
@@ -37,6 +37,7 @@
     self.mox.StubOutWithMock(common_util, 'GetFileSize')
     self.mox.StubOutWithMock(common_util, 'GetFileSha1')
     self.mox.StubOutWithMock(common_util, 'GetFileSha256')
+    self.mox.StubOutWithMock(common_util, 'IsInsideChroot')
     self.mox.StubOutWithMock(autoupdate_lib, 'GetUpdateResponse')
     self.mox.StubOutWithMock(autoupdate.Autoupdate, '_GetRemotePayloadAttrs')
     self.port = 8080
@@ -116,6 +117,7 @@
                              'GenerateUpdateImageWithCache')
     au_mock = self._DummyAutoupdateConstructor()
 
+    common_util.IsInsideChroot().AndReturn(True)
     self._xbuddy._GetArtifact(
         [''], self.test_board, lookup_only=True).AndReturn(
             (latest_label, constants.TEST_IMAGE_FILE))
@@ -161,6 +163,7 @@
       with open(update_image, 'w') as fh:
         fh.write('')
 
+    common_util.IsInsideChroot().AndReturn(True)
     au_mock.GenerateUpdateImageWithCache(static_forced_image,
         static_image_dir=static_forced_image_dir).WithSideEffects(
         mock_fn).AndReturn('cache')