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
=== modified file 'lib/lp/buildmaster/tests/test_builder.py'
--- lib/lp/buildmaster/tests/test_builder.py 2010-09-21 16:23:35 +0000
+++ lib/lp/buildmaster/tests/test_builder.py 2010-09-21 20:57:44 +0000
@@ -555,11 +555,11 @@
555555
556 def test_clean(self):556 def test_clean(self):
557 slave = self.getClientSlave()557 slave = self.getClientSlave()
558 # XXX: JonathanLange 2010-09-21: Calling clean() on the slave requires558 # clean() only works when in aborted / waiting state.
559 # it to be in either the WAITING or ABORTED states, and both of these559 self.triggerGoodBuild(slave)
560 # states are very difficult to achieve in a test environment. For the560 slave.abort()
561 # time being, we'll just assert that a clean attribute exists.561 result = slave.clean()
562 self.assertNotEqual(getattr(slave, 'clean', None), None)562 self.assertEqual(BuilderStatus.IDLE, result)
563563
564 def test_echo(self):564 def test_echo(self):
565 # Calling 'echo' contacts the server which returns the arguments we565 # Calling 'echo' contacts the server which returns the arguments we
566566
=== modified file 'lib/lp/soyuz/tests/test_archive.py'
--- lib/lp/soyuz/tests/test_archive.py 2010-09-21 11:08:26 +0000
+++ lib/lp/soyuz/tests/test_archive.py 2010-09-21 20:57:44 +0000
@@ -355,9 +355,8 @@
355 # Enabling an archive should set all the Archive's suspended builds to355 # Enabling an archive should set all the Archive's suspended builds to
356 # WAITING.356 # WAITING.
357 archive = self.factory.makeArchive(enabled=True)357 archive = self.factory.makeArchive(enabled=True)
358 build = self.factory.makeBinaryPackageBuild(358 self.factory.makeBinaryPackageBuild(
359 archive=archive, status=BuildStatus.NEEDSBUILD)359 archive=archive, status=BuildStatus.NEEDSBUILD)
360 build.queueBuild()
361 # disable the archive, as it is currently enabled360 # disable the archive, as it is currently enabled
362 removeSecurityProxy(archive).disable()361 removeSecurityProxy(archive).disable()
363 self.assertHasBuildJobsWithStatus(archive, JobStatus.SUSPENDED, 1)362 self.assertHasBuildJobsWithStatus(archive, JobStatus.SUSPENDED, 1)
@@ -374,9 +373,8 @@
374 # Disabling an archive should set all the Archive's pending bulds to373 # Disabling an archive should set all the Archive's pending bulds to
375 # SUSPENDED.374 # SUSPENDED.
376 archive = self.factory.makeArchive(enabled=True)375 archive = self.factory.makeArchive(enabled=True)
377 build = self.factory.makeBinaryPackageBuild(376 self.factory.makeBinaryPackageBuild(
378 archive=archive, status=BuildStatus.NEEDSBUILD)377 archive=archive, status=BuildStatus.NEEDSBUILD)
379 build.queueBuild()
380 self.assertHasBuildJobsWithStatus(archive, JobStatus.WAITING, 1)378 self.assertHasBuildJobsWithStatus(archive, JobStatus.WAITING, 1)
381 removeSecurityProxy(archive).disable()379 removeSecurityProxy(archive).disable()
382 self.assertNoBuildJobsHaveStatus(archive, JobStatus.WAITING)380 self.assertNoBuildJobsHaveStatus(archive, JobStatus.WAITING)
383381
=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py 2010-09-21 11:45:15 +0000
+++ lib/lp/testing/factory.py 2010-09-21 20:57:44 +0000
@@ -1900,7 +1900,7 @@
1900 if difference_type is not (1900 if difference_type is not (
1901 DistroSeriesDifferenceType.MISSING_FROM_DERIVED_SERIES):1901 DistroSeriesDifferenceType.MISSING_FROM_DERIVED_SERIES):
19021902
1903 self.makeSourcePackagePublishingHistory(1903 source_pub = self.makeSourcePackagePublishingHistory(
1904 distroseries=derived_series,1904 distroseries=derived_series,
1905 version=versions.get('derived'),1905 version=versions.get('derived'),
1906 sourcepackagename=source_package_name,1906 sourcepackagename=source_package_name,
@@ -1909,7 +1909,7 @@
1909 if difference_type is not (1909 if difference_type is not (
1910 DistroSeriesDifferenceType.UNIQUE_TO_DERIVED_SERIES):1910 DistroSeriesDifferenceType.UNIQUE_TO_DERIVED_SERIES):
19111911
1912 self.makeSourcePackagePublishingHistory(1912 source_pub = self.makeSourcePackagePublishingHistory(
1913 distroseries=derived_series.parent_series,1913 distroseries=derived_series.parent_series,
1914 version=versions.get('parent'),1914 version=versions.get('parent'),
1915 sourcepackagename=source_package_name,1915 sourcepackagename=source_package_name,
@@ -2666,6 +2666,10 @@
2666 date_created=self.getUniqueDate())2666 date_created=self.getUniqueDate())
2667 naked_build = removeSecurityProxy(binary_package_build)2667 naked_build = removeSecurityProxy(binary_package_build)
2668 naked_build.builder = builder2668 naked_build.builder = builder
2669 binary_package_build_job = naked_build.makeJob()
2670 BuildQueue(
2671 job=binary_package_build_job.job,
2672 job_type=BuildFarmJobType.PACKAGEBUILD)
2669 return binary_package_build2673 return binary_package_build
26702674
2671 def makeSourcePackagePublishingHistory(self, sourcepackagename=None,2675 def makeSourcePackagePublishingHistory(self, sourcepackagename=None,
26722676
=== modified file 'lib/lp/testing/tests/test_factory.py'
--- lib/lp/testing/tests/test_factory.py 2010-09-21 11:08:26 +0000
+++ lib/lp/testing/tests/test_factory.py 2010-09-21 20:57:44 +0000
@@ -113,12 +113,6 @@
113 status=BuildStatus.FULLYBUILT)113 status=BuildStatus.FULLYBUILT)
114 self.assertEqual(BuildStatus.FULLYBUILT, bpb.status)114 self.assertEqual(BuildStatus.FULLYBUILT, bpb.status)
115115
116 def test_makeBinaryPackageBuild_can_be_queued(self):
117 build = self.factory.makeBinaryPackageBuild()
118 # Just check that makeBinaryPackageBuild returns a build that can be
119 # queued.
120 build.queueBuild()
121
122 # makeBinaryPackageName116 # makeBinaryPackageName
123 def test_makeBinaryPackageName_returns_proxied_IBinaryPackageName(self):117 def test_makeBinaryPackageName_returns_proxied_IBinaryPackageName(self):
124 binarypackagename = self.factory.makeBinaryPackageName()118 binarypackagename = self.factory.makeBinaryPackageName()