From d4a67c2b8cef1da0882daa750407f66c1bd1124e Mon Sep 17 00:00:00 2001 From: Josafat Garcia Date: Thu, 26 Feb 2015 05:13:04 +0000 Subject: 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 Reviewed-by: Josafat Garcia Commit-Queue: Josafat Garcia Tested-by: Josafat Garcia --- cbuildbot/stages/sync_stages_unittest.py | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'cbuildbot/stages/sync_stages_unittest.py') 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() -- cgit v1.2.3