You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bloodhound.apache.org by rj...@apache.org on 2013/09/20 06:21:25 UTC
svn commit: r1524899 -
/bloodhound/trunk/bloodhound_search/bhsearch/tests/security.py
Author: rjollos
Date: Fri Sep 20 04:21:25 2013
New Revision: 1524899
URL: http://svn.apache.org/r1524899
Log:
08.dev: First argument to the assert method is the expected value, per convention. Made some PEP-0008 whitespace changes.
Modified:
bloodhound/trunk/bloodhound_search/bhsearch/tests/security.py
Modified: bloodhound/trunk/bloodhound_search/bhsearch/tests/security.py
URL: http://svn.apache.org/viewvc/bloodhound/trunk/bloodhound_search/bhsearch/tests/security.py?rev=1524899&r1=1524898&r2=1524899&view=diff
==============================================================================
--- bloodhound/trunk/bloodhound_search/bhsearch/tests/security.py (original)
+++ bloodhound/trunk/bloodhound_search/bhsearch/tests/security.py Fri Sep 20 04:21:25 2013
@@ -31,9 +31,9 @@ try:
except ImportError:
configobj = None
-from trac.perm import (DefaultPermissionPolicy, PermissionCache,
- PermissionSystem)
-
+from trac.perm import (
+ DefaultPermissionPolicy, PermissionCache, PermissionSystem
+)
from bhsearch.api import BloodhoundSearchApi
from bhsearch.tests import unittest
from bhsearch.tests.base import BaseBloodhoundSearchTest
@@ -48,7 +48,8 @@ from bhsearch import security
class SecurityTest(BaseBloodhoundSearchTest):
def setUp(self, enabled=[]):
super(SecurityTest, self).setUp(
- enabled=enabled + ['trac.*', 'trac.wiki.*', 'bhsearch.*', 'multiproduct.*'],
+ enabled=enabled + ['trac.*', 'trac.wiki.*',
+ 'bhsearch.*', 'multiproduct.*'],
create_req=True,
enable_security=True,
)
@@ -119,38 +120,38 @@ class MultiProductSecurityTestCase(Secur
self.insert_ticket('ticket 3')
results = self.search_api.query("type:wiki", context=self.context)
- self.assertEqual(results.hits, 0)
+ self.assertEqual(0, results.hits)
self._add_permission('x', 'WIKI_VIEW')
results = self.search_api.query("type:wiki", context=self.context)
- self.assertEqual(results.hits, 0)
+ self.assertEqual(0, results.hits)
self._add_permission('x', 'WIKI_VIEW', 'p1')
results = self.search_api.query("type:wiki", context=self.context)
- self.assertEqual(results.hits, 1)
+ self.assertEqual(1, results.hits)
self._add_permission('x', 'WIKI_VIEW', 'p2')
results = self.search_api.query("type:wiki", context=self.context)
- self.assertEqual(results.hits, 2)
+ self.assertEqual(2, results.hits)
self._add_permission('x', 'TICKET_VIEW', 'p2')
results = self.search_api.query("*", context=self.context)
- self.assertEqual(results.hits, 3)
+ self.assertEqual(3, results.hits)
self._add_permission('x', 'TICKET_VIEW', 'p1')
results = self.search_api.query("*", context=self.context)
- self.assertEqual(results.hits, 4)
+ self.assertEqual(4, results.hits)
self._add_permission('x', 'TICKET_VIEW')
results = self.search_api.query("*", context=self.context)
- self.assertEqual(results.hits, 5)
+ self.assertEqual(5, results.hits)
def test_admin_has_access(self):
with self.product('p1'):
self.insert_wiki('page 1', 'content')
self._add_permission('x', 'TRAC_ADMIN')
results = self.search_api.query("*", context=self.context)
- self.assertEqual(results.hits, 1)
+ self.assertEqual(1, results.hits)
def test_admin_granted_in_product_should_not_have_access(self):
with self.product('p1'):
@@ -158,7 +159,7 @@ class MultiProductSecurityTestCase(Secur
self._add_permission('x', 'TRAC_ADMIN', 'p1')
results = self.search_api.query("*", context=self.context)
- self.assertEqual(results.hits, 1)
+ self.assertEqual(1, results.hits)
def test_product_owner_has_access(self):
self._add_products('p3', owner='x')
@@ -166,13 +167,13 @@ class MultiProductSecurityTestCase(Secur
self.insert_ticket("ticket")
results = self.search_api.query("*", context=self.context)
- self.assertEqual(results.hits, 1)
+ self.assertEqual(1, results.hits)
def test_user_with_no_permissions(self):
with self.product('p1'):
self.insert_wiki('page 1', 'content')
results = self.search_api.query("type:wiki", context=self.context)
- self.assertEqual(results.hits, 0)
+ self.assertEqual(0, results.hits)
def test_adding_security_filters_retains_existing_filters(self):
with self.product('p1'):
@@ -189,14 +190,14 @@ class MultiProductSecurityTestCase(Secur
filter=["status:closed"],
context=self.context
)
- self.assertEqual(results.hits, 2)
+ self.assertEqual(2, results.hits)
def test_product_dropdown_with_no_permission(self):
self._add_permission('x', 'SEARCH_VIEW')
data = self.process_request()
product_list = data['search_product_list']
- self.assertEqual(len(product_list), 2)
+ self.assertEqual(2, len(product_list))
def test_product_dropdown_with_trac_admin_permission(self):
self._add_permission('x', 'SEARCH_VIEW')
@@ -204,7 +205,7 @@ class MultiProductSecurityTestCase(Secur
data = self.process_request()
product_list = data['search_product_list']
- self.assertEqual(len(product_list), 5)
+ self.assertEqual(5, len(product_list))
def test_product_dropdown_with_product_view_permissions(self):
self._add_permission('x', 'SEARCH_VIEW')
@@ -212,7 +213,7 @@ class MultiProductSecurityTestCase(Secur
data = self.process_request()
product_list = data['search_product_list']
- self.assertEqual(len(product_list), 3)
+ self.assertEqual(3, len(product_list))
def test_check_permission_is_called_with_advanced_security(self):
self.env.config.set('bhsearch', 'advanced_security', "True")
@@ -239,8 +240,8 @@ class MultiProductSecurityTestCase(Secur
context=self.context
)
- self.assertEqual(results.hits, 5)
- self.assertEqual(len(calls), 5)
+ self.assertEqual(5, results.hits)
+ self.assertEqual(5, len(calls))
def test_advanced_security_overrides_normal_permissions(self):
self.env.config.set('bhsearch', 'advanced_security', "True")
@@ -257,7 +258,7 @@ class MultiProductSecurityTestCase(Secur
context=self.context
)
- self.assertEqual(results.hits, 1)
+ self.assertEqual(1, results.hits)
class AuthzSecurityTestCase(SecurityTest):
@@ -276,6 +277,10 @@ class AuthzSecurityTestCase(SecurityTest
self.insert_ticket('ticket 2')
self.insert_wiki('page 1', 'content')
+ def write_authz_config(self, content):
+ with open(self.authz_config, 'w') as authz_config:
+ authz_config.write(content)
+
def test_authz_permissions(self):
self._add_permission('x', 'WIKI_VIEW')
self.write_authz_config('\n'.join([
@@ -284,9 +289,9 @@ class AuthzSecurityTestCase(SecurityTest
]))
results = self.search_api.query("type:ticket", context=self.context)
- self.assertEqual(results.hits, 2)
+ self.assertEqual(2, results.hits)
results = self.search_api.query("type:wiki", context=self.context)
- self.assertEqual(results.hits, 0)
+ self.assertEqual(0, results.hits)
def test_granular_permissions(self):
self.write_authz_config("""
@@ -295,8 +300,8 @@ class AuthzSecurityTestCase(SecurityTest
""")
results = self.search_api.query("type:ticket", context=self.context)
- self.assertEqual(results.hits, 1)
- self.assertEqual(results.docs[0]['id'], u'1')
+ self.assertEqual(1, results.hits)
+ self.assertEqual(u'1', results.docs[0]['id'])
def test_deny_overrides_default_permissions(self):
self._add_permission('x', 'TICKET_VIEW')
@@ -306,9 +311,9 @@ class AuthzSecurityTestCase(SecurityTest
""")
results = self.search_api.query("type:ticket", context=self.context)
- self.assertEqual(results.hits, 0)
+ self.assertEqual(0, results.hits)
- def test_includes_wildcard_rows_for_registred_users(self):
+ def test_includes_wildcard_rows_for_registered_users(self):
self.write_authz_config("""
[*]
* = TICKET_VIEW
@@ -317,11 +322,10 @@ class AuthzSecurityTestCase(SecurityTest
""")
results = self.search_api.query("type:ticket", context=self.context)
- self.assertEqual(results.hits, 1)
-
+ self.assertEqual(1, results.hits)
def test_includes_wildcard_rows_for_anonymous_users(self):
- self.req.authname='anonymous'
+ self.req.authname = 'anonymous'
self.write_authz_config("""
[*]
* = TICKET_VIEW
@@ -330,9 +334,9 @@ class AuthzSecurityTestCase(SecurityTest
""")
results = self.search_api.query("type:ticket", context=self.context)
- self.assertEqual(results.hits, 1)
+ self.assertEqual(1, results.hits)
- def test_includes_authenticated_rows_for_registred_users(self):
+ def test_includes_authenticated_rows_for_registered_users(self):
self.write_authz_config("""
[*]
* = TICKET_VIEW
@@ -341,9 +345,9 @@ class AuthzSecurityTestCase(SecurityTest
""")
results = self.search_api.query("type:ticket", context=self.context)
- self.assertEqual(results.hits, 1)
+ self.assertEqual(1, results.hits)
- def test_includes_named_rows_for_registred_users(self):
+ def test_includes_named_rows_for_registered_users(self):
self.write_authz_config("""
[*]
* = TICKET_VIEW
@@ -352,7 +356,7 @@ class AuthzSecurityTestCase(SecurityTest
""")
results = self.search_api.query("type:ticket", context=self.context)
- self.assertEqual(results.hits, 1)
+ self.assertEqual(1, results.hits)
def test_includes_named_rows_for_anonymous_users(self):
self.req.authname = 'anonymous'
@@ -364,7 +368,7 @@ class AuthzSecurityTestCase(SecurityTest
""")
results = self.search_api.query("type:ticket", context=self.context)
- self.assertEqual(results.hits, 1)
+ self.assertEqual(1, results.hits)
def test_understands_groups(self):
self.write_authz_config("""
@@ -379,11 +383,7 @@ class AuthzSecurityTestCase(SecurityTest
""")
results = self.search_api.query("type:ticket", context=self.context)
- self.assertEqual(results.hits, 1)
-
- def write_authz_config(self, content):
- with open(self.authz_config, 'w') as authz_config:
- authz_config.write(content)
+ self.assertEqual(1, results.hits)
def suite():