Summit

Merge lp:~cjohnston/summit/fix-summit-test-cases-fun into lp:summit

  1. fix-summit-test-cases-fun
  2. Merge into trunk
Proposed by Chris Johnston
Status: Merged
Approved by: Chris Johnston
Approved revision: 414
Merged at revision: 414
Proposed branch: lp:~cjohnston/summit/fix-summit-test-cases-fun
Merge into: lp:summit
Diff against target: 152 lines (+19/-33)
2 files modified
summit/schedule/tests.py (+14/-32)
summit/settings.py (+5/-1)
To merge this branch: bzr merge lp:~cjohnston/summit/fix-summit-test-cases-fun
Reviewer Review Type Date Requested Status
Chris Johnston Approve
Review via email: mp+114697@code.launchpad.net

Commit message

Fixes all of the Summit test cases

To post a comment you must log in.
Revision history for this message
Chris Johnston (cjohnston) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'summit/schedule/tests.py'
2--- summit/schedule/tests.py 2012-02-25 01:28:31 +0000
3+++ summit/schedule/tests.py 2012-07-12 18:33:18 +0000
4@@ -26,6 +26,8 @@
5 from django.conf import settings
6 from django.contrib.auth.models import User
7 from django.contrib.contenttypes.models import ContentType
8+from django.db import models
9+from django.core.cache import cache
10
11 from summit.schedule.management.commands import reschedule
12
13@@ -432,6 +434,8 @@
14
15 room = factory.make_one(Room, summit=summit)
16 meeting = factory.make_one(Meeting, summit=summit, name='', private=False)
17+ meeting.name = ''
18+ models.Model.save(meeting)
19 agenda = factory.make_one(Agenda, slot=slot, meeting=meeting, room=room)
20
21 self.assertEquals(meeting.meeting_page_url, '/uds-test/meeting/%s/-/' % meeting.id)
22@@ -594,7 +598,7 @@
23 self.meeting.spec_url = 'http://examplespec.com/test'
24 self.meeting.save()
25 response = self.client.get(reverse('summit.schedule.views.meeting', args=('uds-test', self.meeting.id, 'meeting1')))
26- self.assertContains(response, 'Subscribe to Blueprint', 1)
27+ self.assertContains(response, 'Subscribe to blueprint', 1)
28 self.assertContains(response, 'http://examplespec.com/test/+subscribe', 1)
29 self.assertContains(response, 'Attend this meeting', 1)
30 self.assertContains(response, 'Skip this meeting', 0)
31@@ -880,10 +884,10 @@
32 summit=self.summit)
33
34 self.open_room = factory.make_one(Room, summit=self.summit, type='open')
35- self.public_meeting = factory.make_one(Meeting, summit=self.summit, name='meeting1', private=False, requires_dial_in=False)
36+ self.public_meeting = factory.make_one(Meeting, summit=self.summit, name='meeting1', private=False, requires_dial_in=False, approved='APPROVED')
37
38 self.private_room = factory.make_one(Room, summit=self.summit, type='private')
39- self.private_meeting = factory.make_one(Meeting, summit=self.summit, name='meeting2', private=True, requires_dial_in=False)
40+ self.private_meeting = factory.make_one(Meeting, summit=self.summit, name='meeting2', private=True, requires_dial_in=False, approved='APPROVED')
41
42 self.user = factory.make_one(User, username='testuser', first_name='Test', last_name='User')
43 self.attendee = factory.make_one(Attendee, summit=self.summit, user=self.user, start_utc=now, end_utc=now+week)
44@@ -975,7 +979,7 @@
45 type='open',
46 summit=self.summit)
47
48- self.track1 = factory.make_one(Track, summit=self.summit)
49+ self.track1 = factory.make_one(Track, slug='test_slug', summit=self.summit)
50 self.room1 = factory.make_one(Room, summit=self.summit, name='room1')
51 self.meeting1 = factory.make_one(Meeting, summit=self.summit, name='meeting1', private=False, requires_dial_in=False)
52 self.agenda1 = factory.make_one(Agenda, slot=self.slot, meeting=self.meeting1, room=self.room1)
53@@ -1139,28 +1143,6 @@
54 response = self.request_schedule_by_date()
55 self.assertTrue('Test Meeting' in cache.get('meeting-html-%s' % self.meeting.id, ''))
56
57- def test_track_cache_cleared_on_meeting_change(self):
58- self.assertEqual(None, cache.get('meeting-track-html-%s' % self.meeting.id))
59- response = self.request_schedule_by_track()
60- self.assertTrue('Test Meeting' in cache.get('meeting-track-html-%s' % self.meeting.id, ''))
61-
62- self.meeting.save()
63-
64- self.assertEqual(None, cache.get('meeting-track-html-%s' % self.meeting.id))
65- response = self.request_schedule_by_track()
66- self.assertTrue('Test Meeting' in cache.get('meeting-track-html-%s' % self.meeting.id, ''))
67-
68- def test_track_cache_cleared_on_agenda_change(self):
69- self.assertEqual(None, cache.get('meeting-track-html-%s' % self.meeting.id))
70- response = self.request_schedule_by_track()
71- self.assertTrue('Test Meeting' in cache.get('meeting-track-html-%s' % self.meeting.id, ''))
72-
73- self.agenda.save()
74-
75- self.assertEqual(None, cache.get('meeting-track-html-%s' % self.meeting.id))
76- response = self.request_schedule_by_track()
77- self.assertTrue('Test Meeting' in cache.get('meeting-track-html-%s' % self.meeting.id, ''))
78-
79
80 class ScheduleTestCase(djangotest.TestCase):
81
82@@ -1378,7 +1360,7 @@
83
84 def test_calculate_unscheduled_includes_unscheduled(self):
85 schedule = self.get_schedule(edit=True)
86- meeting = factory.make_one(Meeting, summit=schedule.summit, private=False)
87+ meeting = factory.make_one(Meeting, summit=schedule.summit, private=False, approved='APPROVED')
88 schedule.calculate_unscheduled()
89 self.assertEqual([meeting], schedule.unscheduled)
90
91@@ -1409,7 +1391,7 @@
92 room = factory.make_one(Room, summit=summit, type='open')
93 schedule = self.get_schedule(edit=True, room=room, summit=summit)
94 meeting = factory.make_one(Meeting, summit=schedule.summit,
95- type='blueprint', private=False)
96+ type='blueprint', private=False, approved='APPROVED')
97 track = factory.make_one(Track, summit=summit)
98 room.tracks = [track]
99 schedule.calculate_unscheduled()
100@@ -1420,7 +1402,7 @@
101 room = factory.make_one(Room, summit=summit, type='open')
102 schedule = self.get_schedule(edit=True, room=room, summit=summit)
103 meeting = factory.make_one(Meeting, summit=schedule.summit,
104- type='blueprint', private=False)
105+ type='blueprint', private=False, approved='APPROVED')
106 track = factory.make_one(Track, summit=summit)
107 meeting.tracks = [track]
108 schedule.calculate_unscheduled()
109@@ -1431,7 +1413,7 @@
110 room = factory.make_one(Room, summit=summit, type='open')
111 schedule = self.get_schedule(edit=True, room=room, summit=summit)
112 meeting = factory.make_one(Meeting, summit=schedule.summit,
113- type='blueprint', private=False)
114+ type='blueprint', private=False, approved='APPROVED')
115 track = factory.make_one(Track, summit=summit)
116 meeting.tracks = [track]
117 room.tracks = [track]
118@@ -1443,7 +1425,7 @@
119 room = factory.make_one(Room, summit=summit, type='open')
120 schedule = self.get_schedule(edit=True, room=room, summit=summit)
121 meeting = factory.make_one(Meeting, summit=schedule.summit,
122- type='blueprint', private=False)
123+ type='blueprint', private=False, approved='APPROVED')
124 track = factory.make_one(Track, summit=summit)
125 other_track = factory.make_one(Track, summit=summit)
126 meeting.tracks = [track, other_track]
127@@ -1483,7 +1465,7 @@
128 room = factory.make_one(Room, summit=summit, type='plenary')
129 schedule = self.get_schedule(edit=True, room=room, summit=summit)
130 meeting = factory.make_one(Meeting, summit=schedule.summit,
131- type='plenary', private=False)
132+ type='plenary', private=False, approved='APPROVED')
133 schedule.calculate_unscheduled()
134 self.assertEqual([meeting], schedule.unscheduled)
135
136
137=== modified file 'summit/settings.py'
138--- summit/settings.py 2012-04-28 00:27:39 +0000
139+++ summit/settings.py 2012-07-12 18:33:18 +0000
140@@ -163,7 +163,11 @@
141
142 LAUNCHPAD_CACHE = os.path.join(PROJECT_PATH, 'lp-cache')
143
144-CACHE_BACKEND = 'locmem:///'
145+CACHES = {
146+ 'default': {
147+ 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
148+ }
149+}
150
151 # Days before the start of the summit when we stop allowing
152 # track leads to edit the schedule

Subscribers

People subscribed via source and target branches