diff options
| author | Josafat Garcia <josafat@chromium.org> | 2015-02-26 05:13:04 +0000 |
|---|---|---|
| committer | Josafat Garcia <josafat@chromium.org> | 2015-02-26 05:16:18 +0000 |
| commit | d4a67c2b8cef1da0882daa750407f66c1bd1124e (patch) | |
| tree | 2f6bbc145db7e27e2630387adb3753299c08b698 /cbuildbot/stages/sync_stages_unittest.py | |
| parent | 75900185ecf0eeae21a524e32944289137f787f0 (diff) | |
| download | chromite-d4a67c2b8cef1da0882daa750407f66c1bd1124e.tar.gz | |
Revert "Use CIDB for synchronizing between CQ and slaves."
This reverts commit f6b20ba26c87bcbf1fff5872e583470842cd1e7d.
Change-Id: I4945781a40d940ed18d90d821dd34c2f14b35b09
Reviewed-on: https://chromium-review.googlesource.com/253931
Reviewed-by: David James <davidjames@chromium.org>
Reviewed-by: Josafat Garcia <josafat@chromium.org>
Commit-Queue: Josafat Garcia <josafat@chromium.org>
Tested-by: Josafat Garcia <josafat@chromium.org>
Diffstat (limited to 'cbuildbot/stages/sync_stages_unittest.py')
| -rw-r--r-- | cbuildbot/stages/sync_stages_unittest.py | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/cbuildbot/stages/sync_stages_unittest.py b/cbuildbot/stages/sync_stages_unittest.py index d911bddba..f9249343c 100644 --- a/cbuildbot/stages/sync_stages_unittest.py +++ b/cbuildbot/stages/sync_stages_unittest.py @@ -82,14 +82,6 @@ class ManifestVersionedSyncStageTest(generic_stages_unittest.AbstractStageTest): self.PatchObject(manifest_version.BuildSpecsManager, 'GetLatestPassingSpec') self.PatchObject(sync_stages.SyncStage, 'ManifestCheckout', return_value=self.next_version) - self.PatchObject(sync_stages.ManifestVersionedSyncStage, - '_GetMasterVersion', return_value='foo', - autospec=True) - self.PatchObject(sync_stages.ManifestVersionedSyncStage, - '_VerifyMasterId', autospec=True) - self.PatchObject(manifest_version.BuildSpecsManager, 'BootstrapFromVersion', - autospec=True) - self.PatchObject(repository.RepoRepository, 'Sync', autospec=True) self.sync_stage.Run() @@ -322,14 +314,8 @@ class SlaveCQSyncTest(BaseCQTestCase): def testReload(self): """Test basic ability to sync and reload the patches from disk.""" - self.PatchObject(sync_stages.ManifestVersionedSyncStage, - '_GetMasterVersion', return_value='foo', - autospec=True) - self.PatchObject(sync_stages.MasterSlaveLKGMSyncStage, - '_VerifyMasterId', autospec=True) - self.PatchObject(lkgm_manager.LKGMManager, 'BootstrapFromVersion', + self.PatchObject(lkgm_manager.LKGMManager, 'GetLatestCandidate', return_value=self.manifest_path, autospec=True) - self.PatchObject(repository.RepoRepository, 'Sync', autospec=True) self.sync_stage.PerformStage() self.ReloadPool() |