Mercurial > bitten > bitten-test
changeset 554:2c27f3581100
Supply the target platform as a variable `platform` for build recipes, and adjust test accordingly - fixes #376
| author | dfraser |
|---|---|
| date | Wed, 08 Apr 2009 05:16:55 +0000 |
| parents | 98151eb9f1a5 |
| children | fe4293ddf51c |
| files | bitten/master.py bitten/tests/master.py |
| diffstat | 2 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/bitten/master.py +++ b/bitten/master.py @@ -20,7 +20,9 @@ HTTPForbidden, HTTPMethodNotAllowed, HTTPNotFound, \ RequestDone -from bitten.model import BuildConfig, Build, BuildStep, BuildLog, Report +from bitten.model import BuildConfig, Build, BuildStep, BuildLog, Report, \ + TargetPlatform + from bitten.main import BuildSystem from bitten.queue import BuildQueue from bitten.recipe import Recipe @@ -177,6 +179,8 @@ xml.attr['revision'] = build.rev xml.attr['config'] = config.name xml.attr['build'] = str(build.id) + target_platform = TargetPlatform.fetch(self.env, build.platform) + xml.attr['platform'] = target_platform.name body = str(xml) self.log.info('Build slave %r initiated build %d', build.slave,
--- a/bitten/tests/master.py +++ b/bitten/tests/master.py @@ -219,13 +219,14 @@ self.fail('Expected RequestDone') except RequestDone: self.assertEqual(200, outheaders['Status']) - self.assertEqual('63', outheaders['Content-Length']) + self.assertEqual('79', outheaders['Content-Length']) self.assertEqual('application/x-bitten+xml', outheaders['Content-Type']) self.assertEqual('attachment; filename=recipe_test_r123.xml', outheaders['Content-Disposition']) self.assertEqual('<build build="1" config="test"' - ' path="somepath" revision="123"/>', + ' path="somepath" platform="Unix"' + ' revision="123"/>', outbody.getvalue()) # Make sure the started timestamp has been set