← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/buildmaster/tests/test_builder.py

  • Committer: Michael Nelson
  • Date: 2010-06-04 07:20:19 UTC
  • mfrom: (10940 launchpad)
  • mto: This revision was merged to the branch mainline in revision 10942.
  • Revision ID: michael.nelson@canonical.com-20100604072019-qxxsmjfd5b72nxoh
Merge fresh devel.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/buildmaster/tests/test_builder.py
115
115
        """
116
116
        count = 0
117
117
        for build in builds_list[:num_builds]:
118
 
            if build.distroarchseries.architecturetag == archtag:
119
 
                build.buildstate = BuildStatus.BUILDING
 
118
            if build.distro_arch_series.architecturetag == archtag:
 
119
                build.status = BuildStatus.BUILDING
120
120
                build.builder = self.builders[count]
121
121
            count += 1
122
122
 
184
184
    def test_findBuildCandidate_first_build_finished(self):
185
185
        # When joe's first ppa build finishes, his fourth i386 build
186
186
        # will be the next build candidate.
187
 
        self.joe_builds[0].buildstate = BuildStatus.FAILEDTOBUILD
 
187
        self.joe_builds[0].status = BuildStatus.FAILEDTOBUILD
188
188
        next_job = removeSecurityProxy(self.builder4)._findBuildCandidate()
189
189
        build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(next_job)
190
190
        self.failUnlessEqual('joesppa', build.archive.name)
227
227
            self.frog_builder)._findBuildCandidate()
228
228
        build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(next_job)
229
229
        self.failUnlessEqual('primary', build.archive.name)
230
 
        self.failUnlessEqual('gedit', build.sourcepackagerelease.name)
 
230
        self.failUnlessEqual('gedit', build.source_package_release.name)
231
231
 
232
232
        # Now even if we set the build building, we'll still get the
233
233
        # second non-ppa build for the same archive as the next candidate.
234
 
        build.buildstate = BuildStatus.BUILDING
 
234
        build.status = BuildStatus.BUILDING
235
235
        build.builder = self.frog_builder
236
236
        next_job = removeSecurityProxy(
237
237
            self.frog_builder)._findBuildCandidate()
238
238
        build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(next_job)
239
239
        self.failUnlessEqual('primary', build.archive.name)
240
 
        self.failUnlessEqual('firefox', build.sourcepackagerelease.name)
 
240
        self.failUnlessEqual('firefox', build.source_package_release.name)
241
241
 
242
242
    def test_findBuildCandidate_for_recipe_build(self):
243
243
        # Recipe builds with a higher score are selected first.