mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2026-05-04 11:51:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix the tree by stating to right path.

Browse Source 
Change-Id: I33e861066e8a585ce839ebc7a8c23243fb18cd1c

BUG=8083
TEST=Ran unit tests

Review URL: http://codereview.chromium.org/4053007
This commit is contained in:
Chris Sosa 2010-10-23 23:38:48 -07:00
parent 2507b9254a
commit b00c32c335
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/cbuildbot.py
View File

@ -406,8 +406,8 @@ def _ArchiveTestResults(buildroot, board, archive_dir, test_results_dir):
dir_entries = os.listdir(ARCHIVE_BASE)
if len(dir_entries) >= ARCHIVE_COUNT:
oldest_dirs = heapq.nsmallest((len(dir_entries) - ARCHIVE_COUNT) + 1,
[filename for filename in dir_entries],
key=lambda fn: os.stat(fn).st_mtime)
[os.path.join(ARCHIVE_BASE, filename) for filename in dir_entries],
key=lambda fn: os.stat(fn).st_mtime)
Info('Removing archive dirs %s' % oldest_dirs)
for oldest_dir in oldest_dirs:
shutil.rmtree(os.path.join(ARCHIVE_BASE, oldest_dir))

6
bin/cbuildbot_unittest.py
View File

@ -131,8 +131,8 @@ class CBuildBotTest(mox.MoxTestBase):
# Expected calls.
os.path.exists(cbuildbot.ARCHIVE_BASE).AndReturn(True)
os.listdir(os.path.join(cbuildbot.ARCHIVE_BASE)).AndReturn(dir_listing)
os.stat('file1').AndReturn(stat1)
os.stat('file2').AndReturn(stat2)
os.stat(os.path.join(cbuildbot.ARCHIVE_BASE, 'file1')).AndReturn(stat1)
os.stat(os.path.join(cbuildbot.ARCHIVE_BASE, 'file2')).AndReturn(stat2)
# Should remove the oldest path.
shutil.rmtree(os.path.join(cbuildbot.ARCHIVE_BASE, 'file2'))
@ -145,7 +145,7 @@ class CBuildBotTest(mox.MoxTestBase):
os.path.exists(path_to_archive_dir).AndReturn(False)
cbuildbot.RunCommand(['sudo', 'chmod', '-R', '+r', path_to_results])
shutil.copytree(path_to_results, path_to_archive_dir)
cbuildbot.RunCommand(['gzip', '-f', path_to_image])
cbuildbot.RunCommand(['gzip', '-f', '--fast', path_to_image])
shutil.copyfile(path_to_image + '.gz', os.path.join(
path_to_archive_dir, 'chromiumos_qemu_image.bin.gz'))