=== modified file 'lib/lp/registry/tests/test_nameblacklist.py' --- lib/lp/registry/tests/test_nameblacklist.py 2010-11-09 05:18:26 +0000 +++ lib/lp/registry/tests/test_nameblacklist.py 2010-11-11 17:41:52 +0000 @@ -9,7 +9,6 @@ from zope.component import getUtility from zope.interface.verify import verifyObject -from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities from canonical.launchpad.interfaces.lpstorm import IStore from canonical.launchpad.webapp.authorization import check_permission from canonical.testing.layers import ( @@ -23,10 +22,9 @@ from lp.testing import ( ANONYMOUS, login, - login_person, + login_celebrity, TestCaseWithFactory, ) -from lp.testing.sampledata import ADMIN_EMAIL class TestNameBlacklist(TestCaseWithFactory): @@ -64,10 +62,10 @@ # A name that is blacklisted returns the id of the row in the # NameBlacklist table that matched. Rows are tried in order, and the # first match is returned. - self.failUnlessEqual( + self.assertEqual( self.name_blacklist_match("foobar"), self.caret_foo_exp.id) - self.failUnlessEqual( + self.assertEqual( self.name_blacklist_match("barfoo"), self.foo_exp.id) @@ -75,11 +73,11 @@ # If the blacklist is changed in the DB, these changes are noticed. # This test is needed because the stored procedure keeps a cache # of the compiled regular expressions. - self.failUnlessEqual( + self.assertEqual( self.name_blacklist_match("foobar"), self.caret_foo_exp.id) self.caret_foo_exp.regexp = u'nomatch' - self.failUnlessEqual( + self.assertEqual( self.name_blacklist_match("foobar"), self.foo_exp.id) self.foo_exp.regexp = u'nomatch2' @@ -108,34 +106,45 @@ def setUp(self): super(TestNameBlacklistSet, self).setUp() - registry_experts = getUtility(ILaunchpadCelebrities).registry_experts - registry_expert = self.factory.makePerson() - login(ADMIN_EMAIL) - registry_experts.addMember(registry_expert, registry_expert) - login_person(registry_expert) + login_celebrity('registry_experts') self.name_blacklist_set = getUtility(INameBlacklistSet) def test_create_with_one_arg(self): # Test NameBlacklistSet.create(regexp). name_blacklist = self.name_blacklist_set.create(u'foo') self.assertTrue(verifyObject(INameBlacklist, name_blacklist)) - self.assertEquals(u'foo', name_blacklist.regexp) + self.assertEqual(u'foo', name_blacklist.regexp) self.assertIs(None, name_blacklist.comment) def test_create_with_two_args(self): # Test NameBlacklistSet.create(regexp, comment). name_blacklist = self.name_blacklist_set.create(u'foo', u'bar') self.assertTrue(verifyObject(INameBlacklist, name_blacklist)) - self.assertEquals(u'foo', name_blacklist.regexp) - self.assertEquals(u'bar', name_blacklist.comment) + self.assertEqual(u'foo', name_blacklist.regexp) + self.assertEqual(u'bar', name_blacklist.comment) - def test_get(self): - # Test NameBlacklistSet.get(). + def test_get_int(self): + # Test NameBlacklistSet.get() with int id. name_blacklist = self.name_blacklist_set.create(u'foo', u'bar') store = IStore(name_blacklist) store.flush() retrieved = self.name_blacklist_set.get(name_blacklist.id) - self.assertEquals(name_blacklist, retrieved) + self.assertEqual(name_blacklist, retrieved) + + def test_get_string(self): + # Test NameBlacklistSet.get() with string id. + name_blacklist = self.name_blacklist_set.create(u'foo', u'bar') + store = IStore(name_blacklist) + store.flush() + retrieved = self.name_blacklist_set.get(str(name_blacklist.id)) + self.assertEqual(name_blacklist, retrieved) + + def test_get_returns_None_instead_of_ValueError(self): + # Test that NameBlacklistSet.get() will return None instead of + # raising a ValueError when it tries to cast the id to an int, + # so that traversing an invalid url causes a Not Found error + # instead of an error that is recorded as an oops. + self.assertIs(None, self.name_blacklist_set.get('asdf')) def test_getAll(self): # Test NameBlacklistSet.getAll(). === modified file 'lib/lp/testing/_login.py' --- lib/lp/testing/_login.py 2010-10-26 15:47:24 +0000 +++ lib/lp/testing/_login.py 2010-11-11 17:07:17 +0000 @@ -23,7 +23,6 @@ ] from contextlib import contextmanager -import random from zope.component import getUtility from zope.security.management import endInteraction @@ -39,10 +38,12 @@ from canonical.launchpad.webapp.servers import LaunchpadTestRequest from canonical.launchpad.webapp.vhosts import allvhosts from lp.services.utils import decorate_with +from lp.testing.sampledata import ADMIN_EMAIL _logged_in = False + def is_logged_in(): global _logged_in return _logged_in @@ -93,24 +94,15 @@ setupInteractionForPerson(person, participation) -def _get_arbitrary_team_member(team): - """Get an arbitrary member of 'team'. - - :param team: An `ITeam`. - """ - # Set up the interaction. - login(ANONYMOUS) - return random.choice(list(team.allmembers)) - - def login_team(team, participation=None): """Login as a member of 'team'.""" - # This check isn't strictly necessary (it depends on the implementation of - # _get_arbitrary_team_member), but this gives us a nice error message, - # which can save time when debugging. + # Prevent import loop. + from lp.testing.factory import LaunchpadObjectFactory if not team.is_team: raise ValueError("Got person, expected team: %r" % (team,)) - person = _get_arbitrary_team_member(team) + person = LaunchpadObjectFactory().makePerson() + login(ADMIN_EMAIL) + team.addMember(person, person) login_person(person, participation=participation) return person