Merge lp:~mhall119/summit/fix-cache into lp:summit

[Michael Hall]

Fixes problem with old cache on track view schedule

Overview
========
Fixes problem with old cache on track view schedule

Details
=======
There was already signal code to clear the cache on meeting or agenda change, but it wasn't clearing the separate cache being used by the track view of the schedule. This code will clear the track view cache, and also adds tests to make sure that both are being cleared.

[Nigel Babu (nigelbabu)]

Nice job!

review: Approve

=== modified file 'summit/schedule/models/__init__.py'
--- summit/schedule/models/__init__.py	2011-09-14 19:39:48 +0000
+++ summit/schedule/models/__init__.py	2011-09-18 01:19:26 +0000
@@ -34,8 +34,10 @@
     instance = kwargs['instance']
     if isinstance(instance, Meeting):
         cache.set('meeting-html-%d' % instance.id, None)
+        cache.set('meeting-track-html-%d' % instance.id, None)
     elif isinstance(instance, Agenda):
         cache.set('meeting-html-%d' % instance.meeting.id, None)
+        cache.set('meeting-track-html-%d' % instance.meeting.id, None)
 
 
 post_save.connect(meeting_update_callback, sender=Meeting)

=== modified file 'summit/schedule/tests.py'
--- summit/schedule/tests.py	2011-09-18 01:00:39 +0000
+++ summit/schedule/tests.py	2011-09-18 01:19:26 +0000
@@ -891,6 +891,95 @@
         self.assertEqual(None, schedule.fakenow)
 
 
+class ScheduleCacheTestCase(djangotest.TestCase):
+
+    def setUp(self):
+        now = datetime.datetime.utcnow()
+        one_hour = datetime.timedelta(0, 3600)
+        week = datetime.timedelta(days=5)
+        self.summit = factory.make_one(Summit, name='uds-test', timezone='UTC')
+        self.slot = factory.make_one(
+            Slot,
+            start_utc=now+one_hour,
+            end_utc=now+(2*one_hour),
+            type='open',
+            summit=self.summit)
+
+        self.track = factory.make_one(Track, slug='test.track', summit=self.summit)
+        self.room = factory.make_one(Room, name='test.room', title='Test Room', summit=self.summit)
+        self.room.tracks = [self.track]
+        self.meeting = factory.make_one(Meeting, summit=self.summit, title='Test Meeting', name='meeting', private=False, requires_dial_in=False)
+        self.meeting.tracks = [self.track]
+        self.agenda = factory.make_one(Agenda, slot=self.slot, meeting=self.meeting, room=self.room)
+
+        self.user = factory.make_one(User, username='testuser', first_name='Test', last_name='User')
+        self.attendee = factory.make_one(Attendee, summit=self.summit, user=self.user, start_utc=now, end_utc=now+week)
+
+    def tearDown(self):
+        # Cached requests cause render.py to return old data, so clear the cache
+        if hasattr(cache, 'clear'):
+            cache.clear()
+        # Older django didn't have .clear, but locmem cache did have ._cull
+        elif hasattr(cache, '_cull'):
+            cache._cull()
+
+    def request_schedule_by_date(self):
+        schedule_args = [self.summit.name, self.agenda.slot.start_utc.date()]
+        schedule_url = reverse('summit.schedule.views.by_date', args=schedule_args)
+        response = self.client.get(schedule_url)
+        return response
+
+    def request_schedule_by_track(self):
+        schedule_args = [self.summit.name, self.track.slug]
+        schedule_url = reverse('summit.schedule.views.by_track', args=schedule_args)
+        response = self.client.get(schedule_url)
+        return response
+
+    def test_cache_cleared_on_meeting_change(self):
+        self.assertEqual(None, cache.get('meeting-html-%s' % self.meeting.id))
+        response = self.request_schedule_by_date()
+        self.assertTrue('Test Meeting' in cache.get('meeting-html-%s' % self.meeting.id, ''))
+        
+        self.meeting.save()
+        
+        self.assertEqual(None, cache.get('meeting-html-%s' % self.meeting.id))
+        response = self.request_schedule_by_date()
+        self.assertTrue('Test Meeting' in cache.get('meeting-html-%s' % self.meeting.id, ''))
+
+    def test_cache_cleared_on_agenda_change(self):
+        self.assertEqual(None, cache.get('meeting-html-%s' % self.meeting.id))
+        response = self.request_schedule_by_date()
+        self.assertTrue('Test Meeting' in cache.get('meeting-html-%s' % self.meeting.id, ''))
+        
+        self.agenda.save()
+        
+        self.assertEqual(None, cache.get('meeting-html-%s' % self.meeting.id))
+        response = self.request_schedule_by_date()
+        self.assertTrue('Test Meeting' in cache.get('meeting-html-%s' % self.meeting.id, ''))
+
+    def test_track_cache_cleared_on_meeting_change(self):
+        self.assertEqual(None, cache.get('meeting-track-html-%s' % self.meeting.id))
+        response = self.request_schedule_by_track()
+        self.assertTrue('Test Meeting' in cache.get('meeting-track-html-%s' % self.meeting.id, ''))
+        
+        self.meeting.save()
+        
+        self.assertEqual(None, cache.get('meeting-track-html-%s' % self.meeting.id))
+        response = self.request_schedule_by_track()
+        self.assertTrue('Test Meeting' in cache.get('meeting-track-html-%s' % self.meeting.id, ''))
+
+    def test_track_cache_cleared_on_agenda_change(self):
+        self.assertEqual(None, cache.get('meeting-track-html-%s' % self.meeting.id))
+        response = self.request_schedule_by_track()
+        self.assertTrue('Test Meeting' in cache.get('meeting-track-html-%s' % self.meeting.id, ''))
+        
+        self.agenda.save()
+        
+        self.assertEqual(None, cache.get('meeting-track-html-%s' % self.meeting.id))
+        response = self.request_schedule_by_track()
+        self.assertTrue('Test Meeting' in cache.get('meeting-track-html-%s' % self.meeting.id, ''))
+
+
 class LaunchpadExportNode(dict):
 
     def __init__(self, *args, **kwargs):