Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(68)

Side by Side Diff: buildbot/prebuilt_unittest.py

Issue 6871033: Fix typo in Packages URLs. (Closed) Base URL: http://git.chromium.org/git/chromite.git@master
Patch Set: Update unit tests. Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « buildbot/prebuilt.py ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/python 1 #!/usr/bin/python
2 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved. 2 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 import copy 6 import copy
7 import mox 7 import mox
8 import os 8 import os
9 import multiprocessing 9 import multiprocessing
10 import shutil 10 import shutil
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after
450 self.mox.UnsetStubs() 450 self.mox.UnsetStubs()
451 self.mox.VerifyAll() 451 self.mox.VerifyAll()
452 452
453 def testSyncHostPrebuilts(self): 453 def testSyncHostPrebuilts(self):
454 package_path = os.path.join(self.build_path, 454 package_path = os.path.join(self.build_path,
455 prebuilt._HOST_PACKAGES_PATH) 455 prebuilt._HOST_PACKAGES_PATH)
456 url_suffix = prebuilt._REL_HOST_PATH % {'version': self.version, 456 url_suffix = prebuilt._REL_HOST_PATH % {'version': self.version,
457 'target': prebuilt._HOST_TARGET } 457 'target': prebuilt._HOST_TARGET }
458 packages_url_suffix = '%s/packages' % url_suffix.rstrip('/') 458 packages_url_suffix = '%s/packages' % url_suffix.rstrip('/')
459 self.uploader._UploadPrebuilt(package_path, packages_url_suffix) 459 self.uploader._UploadPrebuilt(package_path, packages_url_suffix)
460 url_value = '%s/%s/' % (self.binhost.rstrip('/'), url_suffix.rstrip('/')) 460 url_value = '%s/%s/' % (self.binhost.rstrip('/'),
461 packages_url_suffix.rstrip('/'))
461 prebuilt.RevGitFile(mox.IgnoreArg(), url_value, key=self.key) 462 prebuilt.RevGitFile(mox.IgnoreArg(), url_value, key=self.key)
462 prebuilt.UpdateBinhostConfFile(mox.IgnoreArg(), self.key, url_value) 463 prebuilt.UpdateBinhostConfFile(mox.IgnoreArg(), self.key, url_value)
463 self.mox.ReplayAll() 464 self.mox.ReplayAll()
464 self.uploader._SyncHostPrebuilts(self.build_path, self.version, self.key, 465 self.uploader._SyncHostPrebuilts(self.build_path, self.version, self.key,
465 True, True) 466 True, True)
466 467
467 def testSyncBoardPrebuilts(self): 468 def testSyncBoardPrebuilts(self):
468 board = 'x86-generic' 469 board = 'x86-generic'
469 board_path = os.path.join(self.build_path, 470 board_path = os.path.join(self.build_path,
470 prebuilt._BOARD_PATH % {'board': board}) 471 prebuilt._BOARD_PATH % {'board': board})
471 package_path = os.path.join(board_path, 'packages') 472 package_path = os.path.join(board_path, 'packages')
472 url_suffix = prebuilt._REL_BOARD_PATH % {'version': self.version, 473 url_suffix = prebuilt._REL_BOARD_PATH % {'version': self.version,
473 'board': board } 474 'board': board }
474 packages_url_suffix = '%s/packages' % url_suffix.rstrip('/') 475 packages_url_suffix = '%s/packages' % url_suffix.rstrip('/')
475 process = None 476 process = None
476 self.mox.StubOutWithMock(multiprocessing.Process, '__init__') 477 self.mox.StubOutWithMock(multiprocessing.Process, '__init__')
477 self.mox.StubOutWithMock(multiprocessing.Process, 'exitcode') 478 self.mox.StubOutWithMock(multiprocessing.Process, 'exitcode')
478 self.mox.StubOutWithMock(multiprocessing.Process, 'start') 479 self.mox.StubOutWithMock(multiprocessing.Process, 'start')
479 self.mox.StubOutWithMock(multiprocessing.Process, 'join') 480 self.mox.StubOutWithMock(multiprocessing.Process, 'join')
480 multiprocessing.Process.__init__(target=self.uploader._UploadBoardTarball, 481 multiprocessing.Process.__init__(target=self.uploader._UploadBoardTarball,
481 args=(board_path, url_suffix)) 482 args=(board_path, url_suffix))
482 multiprocessing.Process.start() 483 multiprocessing.Process.start()
483 self.uploader._UploadPrebuilt(package_path, packages_url_suffix) 484 self.uploader._UploadPrebuilt(package_path, packages_url_suffix)
484 multiprocessing.Process.join() 485 multiprocessing.Process.join()
485 multiprocessing.Process.exitcode = 0 486 multiprocessing.Process.exitcode = 0
486 url_value = '%s/%s/' % (self.binhost.rstrip('/'), url_suffix.rstrip('/')) 487 url_value = '%s/%s/' % (self.binhost.rstrip('/'),
488 packages_url_suffix.rstrip('/'))
487 prebuilt.DeterminePrebuiltConfFile(self.build_path, board).AndReturn('foo') 489 prebuilt.DeterminePrebuiltConfFile(self.build_path, board).AndReturn('foo')
488 prebuilt.RevGitFile('foo', url_value, key=self.key) 490 prebuilt.RevGitFile('foo', url_value, key=self.key)
489 prebuilt.UpdateBinhostConfFile(mox.IgnoreArg(), self.key, url_value) 491 prebuilt.UpdateBinhostConfFile(mox.IgnoreArg(), self.key, url_value)
490 self.mox.ReplayAll() 492 self.mox.ReplayAll()
491 self.uploader._SyncBoardPrebuilts(board, self.build_path, self.version, 493 self.uploader._SyncBoardPrebuilts(board, self.build_path, self.version,
492 self.key, True, True, True) 494 self.key, True, True, True)
493 495
494 496
495 class TestMain(unittest.TestCase): 497 class TestMain(unittest.TestCase):
496 498
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 options.sync_binhost_conf) 541 options.sync_binhost_conf)
540 self.mox.StubOutWithMock(prebuilt.PrebuiltUploader, '_SyncBoardPrebuilts') 542 self.mox.StubOutWithMock(prebuilt.PrebuiltUploader, '_SyncBoardPrebuilts')
541 prebuilt.PrebuiltUploader._SyncBoardPrebuilts(options.board, 543 prebuilt.PrebuiltUploader._SyncBoardPrebuilts(options.board,
542 options.build_path, mox.IgnoreArg(), options.key, options.git_sync, 544 options.build_path, mox.IgnoreArg(), options.key, options.git_sync,
543 options.sync_binhost_conf, options.upload_board_tarball) 545 options.sync_binhost_conf, options.upload_board_tarball)
544 self.mox.ReplayAll() 546 self.mox.ReplayAll()
545 prebuilt.main() 547 prebuilt.main()
546 548
547 if __name__ == '__main__': 549 if __name__ == '__main__':
548 unittest.main() 550 unittest.main()
OLDNEW
« no previous file with comments | « buildbot/prebuilt.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698