bin/cbuildbot_unittest.py - Issue 4442001: Add more error checking to preflight queue.

Unified Diff: bin/cbuildbot_unittest.py

Issue 4442001: Add more error checking to preflight queue. (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/crosutils.git

Patch Set: s/os.path.exists/os.path.isdir/g Created 10 years, 1 month 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 side-by-side diff with in-line comments

Download patch

Index: bin/cbuildbot_unittest.py

diff --git a/bin/cbuildbot_unittest.py b/bin/cbuildbot_unittest.py

index bbbc56c6f73e9a363f9cf048b20f4064034b0b70..a997184fd627a9a9bc2bb5f2ba3e94c274fa90c6 100755

--- a/bin/cbuildbot_unittest.py

+++ b/bin/cbuildbot_unittest.py

@@ -16,6 +16,7 @@ import unittest

# Fixes circular dependency error.

import cbuildbot_comm

import cbuildbot

+from cros_build_lib import ReinterpretPathForChroot

class CBuildBotTest(mox.MoxTestBase):

@@ -42,6 +43,8 @@ class CBuildBotTest(mox.MoxTestBase):

['dev-util/perf', '12345test'],

['chromos-base/libcros', '12345test']

]

+ self._overlays = [ '%s/src/third_party/chromiumos-overlay' % self._buildroot ]

diandersAtChromium 2010/11/12 22:09:35 NIT: line too long

davidjames 2010/11/12 22:31:25 Done.

+ self._chroot_overlays = [ ReinterpretPathForChroot(self._overlays[0]) ]

diandersAtChromium 2010/11/12 22:09:35 NIT: [ ReinterpretPathForChroot(p) for p in self._

davidjames 2010/11/12 22:31:25 Done.

def testParseRevisionString(self):

"""Test whether _ParseRevisionString parses string correctly."""

@@ -168,13 +171,14 @@ class CBuildBotTest(mox.MoxTestBase):

cbuildbot.RunCommand(['./cros_mark_as_stable', '--all',

'--board=%s' % self._test_board,

- '--tracking_branch="cros/master"', 'commit'],

+ '--overlays=%s' % ':'.join(self._chroot_overlays),

+ '--tracking_branch=cros/master', 'commit'],

cwd='%s/src/scripts' % self._buildroot,

enter_chroot=True)

self.mox.ReplayAll()

cbuildbot._UprevPackages(self._buildroot, self.tracking_branch,

- self._revision_file, self._test_board)

+ self._revision_file, self._test_board, self._overlays)

diandersAtChromium 2010/11/12 22:09:35 NIT: > 80 characters

davidjames 2010/11/12 22:31:25 Done.

self.mox.VerifyAll()

def testUprevAllPackages(self):

@@ -189,13 +193,14 @@ class CBuildBotTest(mox.MoxTestBase):

cbuildbot.RunCommand(['./cros_mark_as_stable', '--all',

'--board=%s' % self._test_board,

- '--tracking_branch="cros/master"', 'commit'],

+ '--overlays=%s' % ':'.join(self._chroot_overlays),

+ '--tracking_branch=cros/master', 'commit'],

cwd='%s/src/scripts' % self._buildroot,

enter_chroot=True)

self.mox.ReplayAll()

cbuildbot._UprevPackages(self._buildroot, self.tracking_branch,

- self._revision_file, self._test_board)

+ self._revision_file, self._test_board, self._overlays)

diandersAtChromium 2010/11/12 22:09:35 NIT: > 80 characters

davidjames 2010/11/12 22:31:25 Done.

self.mox.VerifyAll()

« no previous file with comments | « bin/cbuildbot_config.py ('k') | cros_mark_as_stable.py » ('j') | cros_mark_as_stable.py » ('J')