Skip to content

Cache panel work #1626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matthiask merged 5 commits into from
May 23, 2022
+206 −204
Merged

Cache panel work #1626

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
84c624d
Add dependency on asgiref
living180 May 22, 2022
7366d2b
Allow integration tests to access the toolbar
living180 May 22, 2022
3803724
Use request toolbar for cache integration tests
living180 May 22, 2022
a8513e5
Add a .ready() method to the panel API
living180 May 22, 2022
4b77ec7
Re-architect cache call recording
living180 May 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use request toolbar for cache integration tests 
For integration tests using the cache panel, check the panel associated
with the toolbar created for the request, rather than the toolbar
created for the test case.
  • Loading branch information
@living180
living180 committed May 23, 2022
commit 3803724c921a314a56d05d0dafadaf03abb34de5
28 changes: 14 additions & 14 deletions tests/test_integration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,28 +109,28 @@ def test_cache_page(self):
# Clear the cache before testing the views. Other tests that use cached_view
# may run earlier and cause fewer cache calls.
cache.clear()
self.client.get("/cached_view/")
self.assertEqual(len(self.toolbar.get_panel_by_id("CachePanel").calls), 3)
self.client.get("/cached_view/")
self.assertEqual(len(self.toolbar.get_panel_by_id("CachePanel").calls), 5)
response = self.client.get("/cached_view/")
self.assertEqual(len(response.toolbar.get_panel_by_id("CachePanel").calls), 3)
response = self.client.get("/cached_view/")
self.assertEqual(len(response.toolbar.get_panel_by_id("CachePanel").calls), 2)

@override_settings(ROOT_URLCONF="tests.urls_use_package_urls")
def test_include_package_urls(self):
"""Test urlsconf that uses the debug_toolbar.urls in the include call"""
# Clear the cache before testing the views. Other tests that use cached_view
# may run earlier and cause fewer cache calls.
cache.clear()
self.client.get("/cached_view/")
self.assertEqual(len(self.toolbar.get_panel_by_id("CachePanel").calls), 3)
self.client.get("/cached_view/")
self.assertEqual(len(self.toolbar.get_panel_by_id("CachePanel").calls), 5)
response = self.client.get("/cached_view/")
self.assertEqual(len(response.toolbar.get_panel_by_id("CachePanel").calls), 3)
response = self.client.get("/cached_view/")
self.assertEqual(len(response.toolbar.get_panel_by_id("CachePanel").calls), 2)

def test_low_level_cache_view(self):
"""Test cases when low level caching API is used within a request."""
self.client.get("/cached_low_level_view/")
self.assertEqual(len(self.toolbar.get_panel_by_id("CachePanel").calls), 2)
self.client.get("/cached_low_level_view/")
self.assertEqual(len(self.toolbar.get_panel_by_id("CachePanel").calls), 3)
response = self.client.get("/cached_low_level_view/")
self.assertEqual(len(response.toolbar.get_panel_by_id("CachePanel").calls), 2)
response = self.client.get("/cached_low_level_view/")
self.assertEqual(len(response.toolbar.get_panel_by_id("CachePanel").calls), 1)

def test_cache_disable_instrumentation(self):
"""
Expand All @@ -139,10 +139,10 @@ def test_cache_disable_instrumentation(self):
"""
self.assertIsNone(cache.set("UseCacheAfterToolbar.before", None))
self.assertIsNone(cache.set("UseCacheAfterToolbar.after", None))
self.client.get("/execute_sql/")
response = self.client.get("/execute_sql/")
self.assertEqual(cache.get("UseCacheAfterToolbar.before"), 1)
self.assertEqual(cache.get("UseCacheAfterToolbar.after"), 1)
self.assertEqual(len(self.toolbar.get_panel_by_id("CachePanel").calls), 0)
self.assertEqual(len(response.toolbar.get_panel_by_id("CachePanel").calls), 0)

def test_is_toolbar_request(self):
self.request.path = "/__debug__/render_panel/"
Expand Down