Move Uprev stage prior to InitSDK stage.
BUG=chromium:496995
TEST=Unit tests.
TEST=Trybot runs of paladin builder with and without --buildbot --debug
TEST=Trybot run of incremental builder with --buildbot --debug
TEST=Trybot run of master-paladin with --buildbot --debug
Change-Id: I80ff3de2b484ec798e1828876397fb173bc08c0c
Reviewed-on: https://chromium-review.googlesource.com/275403
Reviewed-by: Don Garrett <dgarrett@chromium.org>
Reviewed-by: David James <davidjames@chromium.org>
Commit-Queue: David James <davidjames@chromium.org>
Tested-by: David James <davidjames@chromium.org>
diff --git a/scripts/cros_mark_as_stable_unittest.py b/scripts/cros_mark_as_stable_unittest.py
index ad264a8..9d87e1b 100644
--- a/scripts/cros_mark_as_stable_unittest.py
+++ b/scripts/cros_mark_as_stable_unittest.py
@@ -98,12 +98,13 @@
def testNormalClean(self):
"""Clean up boards/packages with normal success"""
- cros_mark_as_stable.CleanStalePackages(('board1', 'board2'), ['cow', 'car'])
+ cros_mark_as_stable.CleanStalePackages('.', ('board1', 'board2'),
+ ['cow', 'car'])
def testNothingToUnmerge(self):
"""Clean up packages that don't exist (portage will exit 1)"""
self.rc.AddCmdResult(partial_mock.In('emerge'), returncode=1)
- cros_mark_as_stable.CleanStalePackages((), ['no/pkg'])
+ cros_mark_as_stable.CleanStalePackages('.', (), ['no/pkg'])
def testUnmergeError(self):
"""Make sure random exit errors are not ignored"""
@@ -111,7 +112,7 @@
with parallel_unittest.ParallelMock():
self.assertRaises(cros_build_lib.RunCommandError,
cros_mark_as_stable.CleanStalePackages,
- (), ['no/pkg'])
+ '.', (), ['no/pkg'])
class GitBranchTest(cros_test_lib.MockTestCase):