← Back to branch summary

~twom/canonical-identity-provider/django-1.11.x

« back to all changes in this revision

Viewing changes to src/identityprovider/tests/test_models_account.py

  • Committer: Ubuntu One Auto Copilot
  • Author(s): Colin Watson
  • Date: 2018-01-29 16:32:48 UTC
  • mfrom: (1593.2.1 no-xrange)
  • Revision ID: otto-copilot@canonical.com-20180129163248-zbbccdz42i9u3pwb
Handle range/xrange changes in Python 3.

Merged from https://code.launchpad.net/~cjwatson/canonical-identity-provider/no-xrange/+merge/336733

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/identityprovider/tests/test_models_account.py
1008
1008
        account = self.factory.make_account()
1009
1009
        person = self.factory.make_person(account=account)
1010
1010
        assert account.person == person
1011
 
        for i in xrange(3):
 
1011
        for i in range(3):
1012
1012
            self.factory.make_team(name='team-%s' % i, owner=account.person)
1013
1013
            self.factory.make_team(name='other-team-%s' % i)
1014
1014
 
1020
1020
    def test_many_teams_performance(self):
1021
1021
        accounts = []
1022
1022
        teams = []
1023
 
        for i in xrange(3):
 
1023
        for i in range(3):
1024
1024
            teams.append('team-%i' % i)
1025
 
            for j in xrange(10):
 
1025
            for j in range(10):
1026
1026
                accounts.append(self.factory.make_account(teams=teams))
1027
1027
 
1028
1028
        openid = accounts[0].openid_identifier
1046
1046
        assert self.account.emails().count() == 1
1047
1047
 
1048
1048
        expected = [self.account.preferredemail]
1049
 
        for i in xrange(10):
 
1049
        for i in range(10):
1050
1050
            date_created = now() + timedelta(seconds=i)
1051
1051
            email = EmailAddress.objects.create(
1052
1052
                account=self.account, email='emails-test-%s@example.com' % i,
1272
1272
        assert self.account.oauth_tokens(scope=None).count() == 0
1273
1273
 
1274
1274
        expected = []
1275
 
        for i in xrange(10):
 
1275
        for i in range(10):
1276
1276
            token, _ = self.account.get_or_create_oauth_token(
1277
1277
                'token-%s' % i, scope=None)
1278
1278
            token.updated_at = token.created_at + timedelta(seconds=i)
1299
1299
            scope=TokenScope.VERSION_2).count() == 0
1300
1300
 
1301
1301
        expected = []
1302
 
        for i in xrange(10):
 
1302
        for i in range(10):
1303
1303
            token = self.account.create_oauth_token(
1304
1304
                'token-%s' % i, scope=TokenScope.VERSION_2)
1305
1305
            token.date_updated = token.date_created + timedelta(seconds=i)
1320
1320
 
1321
1321
    def test_oauth_token_by_key(self):
1322
1322
        tokens = {}
1323
 
        for i in xrange(5):
 
1323
        for i in range(5):
1324
1324
            token = self.account.create_oauth_token(
1325
1325
                'token-%s' % i, scope=TokenScope.VERSION_2)
1326
1326
            tokens[token.key] = token
1330
1330
 
1331
1331
    def test_oauth_token_by_key_old_token(self):
1332
1332
        tokens = {}
1333
 
        for i in xrange(5):
 
1333
        for i in range(5):
1334
1334
            token = self.account.create_oauth_token('token-%s' % i, scope=None)
1335
1335
            tokens[token.key] = token
1336
1336