diff options
Diffstat (limited to 'cbuildbot/stages')
| -rw-r--r-- | cbuildbot/stages/completion_stages.py | 2 | ||||
| -rw-r--r-- | cbuildbot/stages/completion_stages_unittest.py | 2 | ||||
| -rw-r--r-- | cbuildbot/stages/sync_stages.py | 8 | ||||
| -rw-r--r-- | cbuildbot/stages/sync_stages_unittest.py | 16 |
4 files changed, 14 insertions, 14 deletions
diff --git a/cbuildbot/stages/completion_stages.py b/cbuildbot/stages/completion_stages.py index e1467d3f0..e18eaf6d0 100644 --- a/cbuildbot/stages/completion_stages.py +++ b/cbuildbot/stages/completion_stages.py @@ -640,7 +640,7 @@ class CommitQueueCompletionStage(MasterSlaveSyncCompletionStage): messages = self._GetFailedMessages(failing) self.SendInfraAlertIfNeeded(failing, inflight, no_stat) - changes = self.sync_stage.pool.changes + changes = self.sync_stage.pool.applied do_partial_submission = self._ShouldSubmitPartialPool() diff --git a/cbuildbot/stages/completion_stages_unittest.py b/cbuildbot/stages/completion_stages_unittest.py index 7e900be31..af5ac8714 100644 --- a/cbuildbot/stages/completion_stages_unittest.py +++ b/cbuildbot/stages/completion_stages_unittest.py @@ -352,7 +352,7 @@ class BaseCommitQueueCompletionStageTest( """ sync_stage = sync_stages.CommitQueueSyncStage(self._run) sync_stage.pool = mock.MagicMock() - sync_stage.pool.changes = self.changes + sync_stage.pool.applied = self.changes sync_stage.pool.tree_was_open = tree_was_open sync_stage.pool.handle_failure_mock = self.PatchObject( diff --git a/cbuildbot/stages/sync_stages.py b/cbuildbot/stages/sync_stages.py index 8eb6ce77f..e682f427a 100644 --- a/cbuildbot/stages/sync_stages.py +++ b/cbuildbot/stages/sync_stages.py @@ -1058,7 +1058,7 @@ class CommitQueueSyncStage(MasterSlaveLKGMSyncStage): else: ManifestVersionedSyncStage.PerformStage(self) - self.WriteChangesToMetadata(self.pool.changes) + self.WriteChangesToMetadata(self.pool.applied) class PreCQSyncStage(SyncStage): @@ -1091,14 +1091,14 @@ class PreCQSyncStage(SyncStage): self.pool = validation_pool.ValidationPool.AcquirePreCQPool( self._run.config.overlays, self._build_root, self._run.buildnumber, self._run.config.name, - dryrun=self._run.options.debug_forced, changes=self.patches, + dryrun=self._run.options.debug_forced, candidates=self.patches, builder_run=self._run) self.pool.ApplyPoolIntoRepo() - if len(self.pool.changes) == 0 and self.patches: + if len(self.pool.applied) == 0 and self.patches: cros_build_lib.Die('No changes have been applied.') - changes = self.pool.changes or self.patches + changes = self.pool.applied or self.patches self.WriteChangesToMetadata(changes) class PreCQLauncherStage(SyncStage): diff --git a/cbuildbot/stages/sync_stages_unittest.py b/cbuildbot/stages/sync_stages_unittest.py index e2dc8297b..f79a9069f 100644 --- a/cbuildbot/stages/sync_stages_unittest.py +++ b/cbuildbot/stages/sync_stages_unittest.py @@ -526,38 +526,38 @@ class MasterCQSyncTest(MasterCQSyncTestCase): def testCommitNonManifestChange(self): """See MasterCQSyncTestCase""" changes = self._testCommitNonManifestChange() - self.assertItemsEqual(self.sync_stage.pool.changes, changes) + self.assertItemsEqual(self.sync_stage.pool.candidates, changes) self.assertItemsEqual(self.sync_stage.pool.non_manifest_changes, []) def testFailedCommitOfNonManifestChange(self): """See MasterCQSyncTestCase""" changes = self._testFailedCommitOfNonManifestChange() - self.assertItemsEqual(self.sync_stage.pool.changes, changes) + self.assertItemsEqual(self.sync_stage.pool.candidates, changes) self.assertItemsEqual(self.sync_stage.pool.non_manifest_changes, []) def testCommitManifestChange(self): """See MasterCQSyncTestCase""" changes = self._testCommitManifestChange() - self.assertItemsEqual(self.sync_stage.pool.changes, changes) + self.assertItemsEqual(self.sync_stage.pool.candidates, changes) self.assertItemsEqual(self.sync_stage.pool.non_manifest_changes, []) def testCommitManifestChangeWithoutPreCQ(self): """Changes get ignored if they aren't approved by pre-cq.""" self._testCommitManifestChange(pre_cq_status=None) - self.assertItemsEqual(self.sync_stage.pool.changes, []) + self.assertItemsEqual(self.sync_stage.pool.candidates, []) self.assertItemsEqual(self.sync_stage.pool.non_manifest_changes, []) def testCommitManifestChangeWithoutPreCQAndOldPatches(self): """Changes get tested without pre-cq if the approval_timestamp is old.""" changes = self._testCommitManifestChange(pre_cq_status=None, approval_timestamp=0) - self.assertItemsEqual(self.sync_stage.pool.changes, changes) + self.assertItemsEqual(self.sync_stage.pool.candidates, changes) self.assertItemsEqual(self.sync_stage.pool.non_manifest_changes, []) def testDefaultSync(self): """See MasterCQSyncTestCase""" changes = self._testDefaultSync() - self.assertItemsEqual(self.sync_stage.pool.changes, changes) + self.assertItemsEqual(self.sync_stage.pool.candidates, changes) self.assertItemsEqual(self.sync_stage.pool.non_manifest_changes, []) def testReload(self): @@ -565,7 +565,7 @@ class MasterCQSyncTest(MasterCQSyncTestCase): # Use zero patches because mock patches can't be pickled. changes = self.PerformSync(num_patches=0, runs=0) self.ReloadPool() - self.assertItemsEqual(self.sync_stage.pool.changes, changes) + self.assertItemsEqual(self.sync_stage.pool.candidates, changes) self.assertItemsEqual(self.sync_stage.pool.non_manifest_changes, []) def testTreeClosureBlocksCommit(self): @@ -579,7 +579,7 @@ class MasterCQSyncTest(MasterCQSyncTestCase): gerrit.GerritHelper.Query.assert_called_with( mock.ANY, constants.THROTTLED_CQ_READY_QUERY[0], sort='lastUpdated') - self.assertItemsEqual(self.sync_stage.pool.changes, changes) + self.assertItemsEqual(self.sync_stage.pool.candidates, changes) self.assertItemsEqual(self.sync_stage.pool.non_manifest_changes, []) |