summaryrefslogtreecommitdiff
path: root/tb3
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2013-07-19 19:59:00 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2013-07-19 19:59:00 +0200
commit8d713bfee958aa1645edc248e03b2b6434e8ab40 (patch)
tree4ad46977ce67772a88d76a800a15aca29ee6de5e /tb3
parent49cc995b657cb5c0ec8a6348aac57e9a7f4d54f9 (diff)
check for build script parms
Diffstat (limited to 'tb3')
-rwxr-xr-xtb3/tb3-local-client2
-rwxr-xr-xtb3/tests/tb3-local-client.py8
2 files changed, 8 insertions, 2 deletions
diff --git a/tb3/tb3-local-client b/tb3/tb3-local-client
index c949dcc..32548cb 100755
--- a/tb3/tb3-local-client
+++ b/tb3/tb3-local-client
@@ -50,6 +50,8 @@ class LocalClient:
proposal['commit'],
self.workdir,
self.args['repo'],
+ self.args['platform'],
+ self.args['builder'],
_err=outfile,
_out=outfile,
_ok_code=range(256)).exit_code
diff --git a/tb3/tests/tb3-local-client.py b/tb3/tests/tb3-local-client.py
index 1ac1dac..2ad3a59 100755
--- a/tb3/tests/tb3-local-client.py
+++ b/tb3/tests/tb3-local-client.py
@@ -7,9 +7,10 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
+import os
+import re
import sh
import sys
-import os
import unittest
import tempfile
@@ -56,7 +57,10 @@ class TestTb3LocalClient(unittest.TestCase):
logfile = open(os.path.join(self.logdir, logfiles[0]), 'r')
lines = [line for line in logfile]
self.assertEqual(len(lines), 1)
- self.assertEqual(lines[0], 'building\n')
+ self.assertNotEqual(re.search('building commit %s' % self.head, lines[0]), None)
+ self.assertNotEqual(re.search('from repo %s' % self.testdir, lines[0]), None)
+ self.assertNotEqual(re.search('on platform %s' % self.platform, lines[0]), None)
+ self.assertNotEqual(re.search('as builder %s' % self.builder, lines[0]), None)
if __name__ == '__main__':
unittest.main()