fix tests for authz view default

buildbot · Jun 26, 2013 · ceb2970 · ceb2970
1 parent 2260f67
commit ceb2970
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/master/buildbot/test/unit/test_status_web_authz_Authz.py b/master/buildbot/test/unit/test_status_web_authz_Authz.py
@@ -66,17 +66,18 @@ def test_actionAllowed_Defaults(self):
         self.dl = []
         for a in Authz.knownActions:
             md = z.actionAllowed(a, StubRequest('foo', 'bar'))
-            def check(res):
-                if res:
-                    self.failedActions.append(a)
+            def check(res, expected):
+                if res != expected:
+                    self.failedActions.append((a, expected))
                 return
-            md.addCallback(check)
+            md.addCallback(check, a == 'view')
             self.dl.append(md)
         d = defer.DeferredList(self.dl)
         def check_failed(_):
             if self.failedActions:
-                raise unittest.FailTest("action(s) %s do not default to False"
-                                        % (self.failedActions,))
+                msgs = '; '.join('%s action authz did not default to %s' % f
+                                 for f in self.failedActions)
+                raise unittest.FailTest(msgs)
         d.addCallback(check_failed)
         return d