← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/webui/tests/test_views_devices.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/webui/tests/test_views_devices.py
579
579
        # check the first N are rendered with strike-through
580
580
        expected_codes = [
581
581
            hotp(self.device.key, i) for i in
582
 
            xrange(offset, offset + settings.TWOFACTOR_PAPER_CODES)]
 
582
            range(offset, offset + settings.TWOFACTOR_PAPER_CODES)]
583
583
        self.assertEqual(len(expected_codes), settings.TWOFACTOR_PAPER_CODES)
584
584
        for elem, code in zip(used, expected_codes[:position]):
585
585
            strike = elem.findall('strike')
648
648
        start = settings.TWOFACTOR_PAPER_CODES * 4
649
649
        end = settings.TWOFACTOR_PAPER_CODES * 5
650
650
        expected_codes = [
651
 
            hotp(self.device.key, i) for i in xrange(start, end)]
 
651
            hotp(self.device.key, i) for i in range(start, end)]
652
652
        codes = [node.text.strip() for node in code_nodes]
653
653
        self.assertEqual(codes, expected_codes)
654
654
 
679
679
 
680
680
    @override_settings(TWOFACTOR_PAPER_CODES_ALLOW_GENERATION=6)
681
681
    def test_device_generate_available_if_few_remaining_codes(self):
682
 
        for i in xrange(settings.TWOFACTOR_PAPER_CODES_ALLOW_GENERATION):
 
682
        for i in range(settings.TWOFACTOR_PAPER_CODES_ALLOW_GENERATION):
683
683
            self.assert_generation_warning_and_button(i)
684
684
 
685
685