fix tests

buildbot · Jul 11, 2015 · 9187c86 · 9187c86
1 parent c9d2002
commit 9187c86
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/master/buildbot/test/unit/test_www_authz.py b/master/buildbot/test/unit/test_www_authz.py
@@ -13,20 +13,23 @@
 #
 # Copyright Buildbot Team Members
 
+from buildbot.test.fake import fakedb
 from buildbot.test.util import www
 from buildbot.www import authz
-from twisted.trial import unittest
-from twisted.internet import defer
-from buildbot.test.fake import fakedb
-from buildbot.www.authz.roles import RolesFromGroups, RolesFromEmails, RolesFromOwner
 from buildbot.www.authz.endpointmatchers import AnyEndpointMatcher
-from buildbot.www.authz.endpointmatchers import ForceBuildEndpointMatcher
 from buildbot.www.authz.endpointmatchers import BranchEndpointMatcher
-from buildbot.www.authz.endpointmatchers import ViewBuildsEndpointMatcher
+from buildbot.www.authz.endpointmatchers import ForceBuildEndpointMatcher
 from buildbot.www.authz.endpointmatchers import StopBuildEndpointMatcher
+from buildbot.www.authz.endpointmatchers import ViewBuildsEndpointMatcher
+from buildbot.www.authz.roles import RolesFromEmails
+from buildbot.www.authz.roles import RolesFromGroups
+from buildbot.www.authz.roles import RolesFromOwner
+from twisted.internet import defer
+from twisted.trial import unittest
 
 
 class Authz(www.WwwTestMixin, unittest.TestCase):
+
     def setUp(self):
         authzcfg = authz.Authz(
             stringsMatcher=authz.fnmatchStrMatcher,  # simple matcher with '*' glob character
@@ -79,7 +82,7 @@ def setUp(self):
             fakedb.Buildset(id=8822),
             fakedb.BuildsetProperty(buildsetid=8822, property_name='owner',
                                     property_value='["user@nine.com", "force"]'),
-            fakedb.BuildRequest(id=82, buildsetid=8822),
+            fakedb.BuildRequest(id=82, buildsetid=8822, builderid=77),
             fakedb.Build(id=13, builderid=77, masterid=88, buildslaveid=13,
                          buildrequestid=82, number=3),
             fakedb.Build(id=14, builderid=77, masterid=88, buildslaveid=13,

diff --git a/master/buildbot/test/unit/test_www_config.py b/master/buildbot/test/unit/test_www_config.py
@@ -44,19 +44,19 @@ def test_render(self):
 
         res = yield self.render_resource(rsrc, '/')
         _auth.maybeAutoLogin.assert_called_with(mock.ANY)
-        exp = '{"titleURL": "http://buildbot.net", "versions": %s, "title": "Buildbot", "auth": {"name": "NoAuth"}, "user": {"anonymous": true}, "buildbotURL": "h:/a/b/", "multiMaster": false, "port": null}'
+        exp = '{"authz": {}, "titleURL": "http://buildbot.net", "versions": %s, "title": "Buildbot", "auth": {"name": "NoAuth"}, "user": {"anonymous": true}, "buildbotURL": "h:/a/b/", "multiMaster": false, "port": null}'
         exp = exp % vjson
-        self.assertIn(res, exp)
+        self.assertEqual(res, exp)
 
         master.session.user_info = dict(name="me", email="me@me.org")
         res = yield self.render_resource(rsrc, '/')
-        exp = '{"titleURL": "http://buildbot.net", "versions": %s, "title": "Buildbot", "auth": {"name": "NoAuth"}, "user": {"email": "me@me.org", "name": "me"}, "buildbotURL": "h:/a/b/", "multiMaster": false, "port": null}'
+        exp = '{"authz": {}, "titleURL": "http://buildbot.net", "versions": %s, "title": "Buildbot", "auth": {"name": "NoAuth"}, "user": {"email": "me@me.org", "name": "me"}, "buildbotURL": "h:/a/b/", "multiMaster": false, "port": null}'
         exp = exp % vjson
-        self.assertIn(res, exp)
+        self.assertEqual(res, exp)
 
         master = self.make_master(url='h:/a/c/', auth=_auth, versions=custom_versions)
         rsrc.reconfigResource(master.config)
         res = yield self.render_resource(rsrc, '/')
-        exp = '{"titleURL": "http://buildbot.net", "versions": %s, "title": "Buildbot", "auth": {"name": "NoAuth"}, "user": {"anonymous": true}, "buildbotURL": "h:/a/b/", "multiMaster": false, "port": null}'
+        exp = '{"authz": {}, "titleURL": "http://buildbot.net", "versions": %s, "title": "Buildbot", "auth": {"name": "NoAuth"}, "user": {"anonymous": true}, "buildbotURL": "h:/a/b/", "multiMaster": false, "port": null}'
         exp = exp % vjson
         self.assertIn(res, exp)