Change RepoSync to use -j4 option. Add tests to check for retries.

buildbot/cbuildbot_commands_unittest.py

 #!/usr/bin/python
 
 # Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Unittests for commands.  Needs to be run inside of chroot for mox."""
 
 import __builtin__
 import mox
@@ skipping 91 matching lines @@
     binhosts = [binhost, None]
     check = mox.And(mox.IsA(list), mox.In(binhost), mox.Not(mox.In(None)),
                     mox.In('chromeos-images:/var/www/prebuilt/'),
                     mox.In('chrome'))
     cros_lib.OldRunCommand(check, cwd=os.path.dirname(commands.__file__))
     self.mox.ReplayAll()
     commands.UploadPrebuilts(self._buildroot, self._test_board, 'private',
                              binhosts, 'chrome', 'tot')
     self.mox.VerifyAll()
 
+  def testRepoSyncRetriesFail(self):
+    """Case where we exceed default retry attempts"""

[davidjames, 2011/04/01 20:20:27]

Please add a trailing period.

[rcui1, 2011/04/01 20:44:08]

Done.

+    cros_lib.OldRunCommand(mox.In('sync'),
+                           cwd=self._buildroot).AndRaise(Exception("failed"))
+    cros_lib.OldRunCommand(mox.In('sync'),
+                            cwd=self._buildroot).AndRaise(Exception("failed"))
+    cros_lib.OldRunCommand(mox.In('sync'),
+                           cwd=self._buildroot).AndRaise(Exception("failed"))
+    self.mox.ReplayAll()
+    self.assertRaises(Exception, lambda : commands._RepoSync(self._buildroot))

[davidjames, 2011/04/01 20:20:27]

No need for the space between 'lambda' and ':'.

(Elsewhere in this file, I see that they use a space, but that's a typo I think
because the rest of chromite doesn't have a space after lambda.)

[rcui1, 2011/04/01 20:44:08]

Done.

+    self.mox.VerifyAll()
+
+  def testRepoSyncRetriesPass(self):
+    """Case where we fail twice and pass on the third try."""
+    cros_lib.OldRunCommand(mox.In('sync'),
+                           cwd=self._buildroot).AndRaise(Exception("failed"))
+    cros_lib.OldRunCommand(mox.In('sync'),
+                           cwd=self._buildroot).AndRaise(Exception("failed"))
+    cros_lib.OldRunCommand(mox.In('sync'), cwd=self._buildroot)
+    cros_lib.OldRunCommand(mox.In('forall'), cwd=self._buildroot)
+    cros_lib.OldRunCommand(mox.In('manifest'), cwd=self._buildroot)
+    self.mox.ReplayAll()
+    commands._RepoSync(self._buildroot)
+    self.mox.VerifyAll()
+
+  def testRepoSyncCustomRetriesFail(self):
+    """Case where _RepoSync is called with a custom retry value of 1.  Should
+    throw exception after first failure."""
+    cros_lib.OldRunCommand(mox.In('sync'),
+                           cwd=self._buildroot).AndRaise(Exception("failed"))
+    self.mox.ReplayAll()
+    self.assertRaises(
+        Exception,
+        lambda : commands._RepoSync(self._buildroot, retries=1))

[davidjames, 2011/04/01 20:20:27]

Ditto.

[rcui1, 2011/04/01 20:44:08]

Done.

+    self.mox.VerifyAll()
+
+  def testRepoSyncCustomRetriesPass(self):
+    """Case where _RepoSync is called with a custom retry value of 2 and passes
+    the second time."""
+    cros_lib.OldRunCommand(mox.In('sync'),
+                           cwd=self._buildroot).AndRaise(Exception("failed"))
+    cros_lib.OldRunCommand(mox.In('sync'), cwd=self._buildroot)
+    cros_lib.OldRunCommand(mox.In('forall'), cwd=self._buildroot)
+    cros_lib.OldRunCommand(mox.In('manifest'), cwd=self._buildroot)
+    self.mox.ReplayAll()
+    commands._RepoSync(self._buildroot, retries=2)
+    self.mox.VerifyAll()
+
 
 if __name__ == '__main__':
   unittest.main()