← Back to branch summary

~ubuntu-branches/ubuntu/saucy/python-django/saucy-updates

« back to all changes in this revision

Viewing changes to tests/regressiontests/cache/tests.py

  • Committer: Bazaar Package Importer
  • Author(s): Barry Warsaw
  • Date: 2011-10-19 10:13:01 UTC
  • Revision ID: james.westby@ubuntu.com-20111019101301-ivpog73ckq6fgtax
Tags: 1.3.1-1ubuntu1
https://launchpad.net/bugs/829487
* Merge with Debian.  Remaining changes:
  - 09_test_view_decorator_sleep.diff increases the sleep time to
    reduce race condition effects on build machines.
    https://code.djangoproject.com/ticket/16686  (LP: #829487)

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/regressiontests/cache/tests.py
1452
1452
        self.assertEqual(response.content, 'Hello World 10')
1453
1453
 
1454
1454
        # And if we wait a few more seconds
1455
 
        time.sleep(2)
 
1455
        time.sleep(5)
1456
1456
 
1457
1457
        # the custom timeouot cache will miss
1458
1458
        response = other_with_timeout_view(request, '18')