Launchpad itself

Merge lp:~mars/launchpad/rollback-11586-and-11588 into lp:launchpad

  1. rollback-11586-and-11588
  2. Merge into devel
Proposed by Māris Fogels
Status: Rejected
Rejected by: Māris Fogels
Proposed branch: lp:~mars/launchpad/rollback-11586-and-11588
Merge into: lp:launchpad
Diff against target: 96 lines (+13/-17)
4 files modified
lib/lp/buildmaster/tests/test_builder.py (+5/-5)
lib/lp/soyuz/tests/test_archive.py (+2/-4)
lib/lp/testing/factory.py (+6/-2)
lib/lp/testing/tests/test_factory.py (+0/-6)
To merge this branch: bzr merge lp:~mars/launchpad/rollback-11586-and-11588
Reviewer Review Type Date Requested Status
Brad Crittenden (community) code Approve
Review via email: mp+36212@code.launchpad.net

Description of the change

This branch rolls back revisions 11586 and 11588 in order to fix buildbot.

To post a comment you must log in.
Revision history for this message
Brad Crittenden (bac) :
review: Approve (code)
Revision history for this message
Brad Crittenden (bac) wrote :

Maris what happened to this branch? Please set to 'Rejected' if abandoned.

Unmerged revisions

11589. By Māris Fogels

Rollback of 11586 and 11588

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/buildmaster/tests/test_builder.py'
2--- lib/lp/buildmaster/tests/test_builder.py 2010-09-21 16:23:35 +0000
3+++ lib/lp/buildmaster/tests/test_builder.py 2010-09-21 20:57:44 +0000
4@@ -555,11 +555,11 @@
5
6 def test_clean(self):
7 slave = self.getClientSlave()
8- # XXX: JonathanLange 2010-09-21: Calling clean() on the slave requires
9- # it to be in either the WAITING or ABORTED states, and both of these
10- # states are very difficult to achieve in a test environment. For the
11- # time being, we'll just assert that a clean attribute exists.
12- self.assertNotEqual(getattr(slave, 'clean', None), None)
13+ # clean() only works when in aborted / waiting state.
14+ self.triggerGoodBuild(slave)
15+ slave.abort()
16+ result = slave.clean()
17+ self.assertEqual(BuilderStatus.IDLE, result)
18
19 def test_echo(self):
20 # Calling 'echo' contacts the server which returns the arguments we
21
22=== modified file 'lib/lp/soyuz/tests/test_archive.py'
23--- lib/lp/soyuz/tests/test_archive.py 2010-09-21 11:08:26 +0000
24+++ lib/lp/soyuz/tests/test_archive.py 2010-09-21 20:57:44 +0000
25@@ -355,9 +355,8 @@
26 # Enabling an archive should set all the Archive's suspended builds to
27 # WAITING.
28 archive = self.factory.makeArchive(enabled=True)
29- build = self.factory.makeBinaryPackageBuild(
30+ self.factory.makeBinaryPackageBuild(
31 archive=archive, status=BuildStatus.NEEDSBUILD)
32- build.queueBuild()
33 # disable the archive, as it is currently enabled
34 removeSecurityProxy(archive).disable()
35 self.assertHasBuildJobsWithStatus(archive, JobStatus.SUSPENDED, 1)
36@@ -374,9 +373,8 @@
37 # Disabling an archive should set all the Archive's pending bulds to
38 # SUSPENDED.
39 archive = self.factory.makeArchive(enabled=True)
40- build = self.factory.makeBinaryPackageBuild(
41+ self.factory.makeBinaryPackageBuild(
42 archive=archive, status=BuildStatus.NEEDSBUILD)
43- build.queueBuild()
44 self.assertHasBuildJobsWithStatus(archive, JobStatus.WAITING, 1)
45 removeSecurityProxy(archive).disable()
46 self.assertNoBuildJobsHaveStatus(archive, JobStatus.WAITING)
47
48=== modified file 'lib/lp/testing/factory.py'
49--- lib/lp/testing/factory.py 2010-09-21 11:45:15 +0000
50+++ lib/lp/testing/factory.py 2010-09-21 20:57:44 +0000
51@@ -1900,7 +1900,7 @@
52 if difference_type is not (
53 DistroSeriesDifferenceType.MISSING_FROM_DERIVED_SERIES):
54
55- self.makeSourcePackagePublishingHistory(
56+ source_pub = self.makeSourcePackagePublishingHistory(
57 distroseries=derived_series,
58 version=versions.get('derived'),
59 sourcepackagename=source_package_name,
60@@ -1909,7 +1909,7 @@
61 if difference_type is not (
62 DistroSeriesDifferenceType.UNIQUE_TO_DERIVED_SERIES):
63
64- self.makeSourcePackagePublishingHistory(
65+ source_pub = self.makeSourcePackagePublishingHistory(
66 distroseries=derived_series.parent_series,
67 version=versions.get('parent'),
68 sourcepackagename=source_package_name,
69@@ -2666,6 +2666,10 @@
70 date_created=self.getUniqueDate())
71 naked_build = removeSecurityProxy(binary_package_build)
72 naked_build.builder = builder
73+ binary_package_build_job = naked_build.makeJob()
74+ BuildQueue(
75+ job=binary_package_build_job.job,
76+ job_type=BuildFarmJobType.PACKAGEBUILD)
77 return binary_package_build
78
79 def makeSourcePackagePublishingHistory(self, sourcepackagename=None,
80
81=== modified file 'lib/lp/testing/tests/test_factory.py'
82--- lib/lp/testing/tests/test_factory.py 2010-09-21 11:08:26 +0000
83+++ lib/lp/testing/tests/test_factory.py 2010-09-21 20:57:44 +0000
84@@ -113,12 +113,6 @@
85 status=BuildStatus.FULLYBUILT)
86 self.assertEqual(BuildStatus.FULLYBUILT, bpb.status)
87
88- def test_makeBinaryPackageBuild_can_be_queued(self):
89- build = self.factory.makeBinaryPackageBuild()
90- # Just check that makeBinaryPackageBuild returns a build that can be
91- # queued.
92- build.queueBuild()
93-
94 # makeBinaryPackageName
95 def test_makeBinaryPackageName_returns_proxied_IBinaryPackageName(self):
96 binarypackagename = self.factory.makeBinaryPackageName()