Restart codereview issue 6792042

buildbot/prebuilt_unittest.py

 #!/usr/bin/python
 # Copyright (c) 2010 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.
 
 import copy
 import mox
 import os
 import multiprocessing
 import shutil
@@ skipping 384 matching lines @@
     self.mox.VerifyAll()
 
   def doRsyncUpload(self, suffix):
     self.mox.StubOutWithMock(prebuilt, '_RetryRun')
     remote_path = '/dir/%s' % suffix.rstrip('/')
     full_remote_path = 'chromeos-prebuilt:%s' % remote_path
     cmds = ['ssh chromeos-prebuilt mkdir -p %s' % remote_path,
             'rsync -av --chmod=a+r fake %s/Packages' % full_remote_path,
             'rsync -Rav private.tbz2 %s/' % full_remote_path]
     for cmd in cmds:
-      prebuilt._RetryRun(cmd, shell=True, cwd='/packages').AndReturn(True)
+      prebuilt._RetryRun(cmd, cwd='/packages').AndReturn(True)
     self.mox.ReplayAll()
     uri = self.pkgindex.header['URI']
     uploader = prebuilt.PrebuiltUploader('chromeos-prebuilt:/dir',
         'public-read', uri, [])
     uploader._UploadPrebuilt('/packages', suffix)
 
   def testSuccessfulGsUpload(self):
     uploads = {'/packages/private.tbz2': 'gs://foo/private.tbz2'}
     self.mox.StubOutWithMock(prebuilt, 'GenerateUploadDict')
     prebuilt.GenerateUploadDict('/packages', 'gs://foo/suffix',
@@ skipping 125 matching lines @@
         options.sync_binhost_conf)
     self.mox.StubOutWithMock(prebuilt.PrebuiltUploader, '_SyncBoardPrebuilts')
     prebuilt.PrebuiltUploader._SyncBoardPrebuilts(options.board,
         options.build_path, mox.IgnoreArg(), options.key, options.git_sync,
         options.sync_binhost_conf, options.upload_board_tarball)
     self.mox.ReplayAll()
     prebuilt.main()
 
 if __name__ == '__main__':
   unittest.main()