Summit

Merge lp:~cjohnston/summit/test-fixes into lp:summit

  1. test-fixes
  2. Merge into trunk
Proposed by Chris Johnston
Status: Merged
Approved by: Michael Hall
Approved revision: 298
Merged at revision: 298
Proposed branch: lp:~cjohnston/summit/test-fixes
Merge into: lp:summit
Diff against target: 57 lines (+9/-11)
1 file modified
summit/schedule/tests.py (+9/-11)
To merge this branch: bzr merge lp:~cjohnston/summit/test-fixes
Reviewer Review Type Date Requested Status
Michael Hall (community) Approve
Review via email: mp+94636@code.launchpad.net

Commit message

Fixes tests for etherpad changes

To post a comment you must log in.
Revision history for this message
Michael Hall (mhall119) wrote :

Thanks for updating the tests

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== renamed file 'summit/schedule/management/commands/lpupdate.py' => 'summit/common/management/commands/lpupdate.py'
2=== modified file 'summit/schedule/tests.py'
3--- summit/schedule/tests.py 2012-01-25 08:32:48 +0000
4+++ summit/schedule/tests.py 2012-02-25 01:30:23 +0000
5@@ -291,7 +291,9 @@
6 self.assertEqual(url, meeting.link_to_pad)
7
8 def get_pad_host(self):
9- return getattr(settings, 'ETHERPAD_HOST', 'http://pad.ubuntu.com/')
10+ summit_name = 'testsummit'
11+ summit = factory.make_one(Summit, name=summit_name)
12+ return getattr(summit, 'etherpad', 'http://pad.ubuntu.com/')
13
14 def test_link_to_pad_with_pad_url_unset(self):
15 summit_name = 'testsummit'
16@@ -764,35 +766,31 @@
17 reverse_url = reverse('summit.schedule.views.user_ical', args=rev_args)
18 self.assertEquals(reverse_url, '/uds-test/participant/test+user.ical')
19
20-
21 class EtherpadEditUrl(djangotest.TestCase):
22
23 def setUp(self):
24- self.old_pad_host = settings.ETHERPAD_HOST
25- settings.ETHERPAD_HOST = 'http://pad.ubuntu.com/'
26+ self.summit = factory.make_one(Summit, name='uds-test')
27+ self.summit.save()
28
29 def tearDown(self):
30- settings.ETHERPAD_HOST = self.old_pad_host
31+ pass
32
33 def test_etherpad_edit_url(self):
34- summit = factory.make_one(Summit, name='uds-test')
35- summit.save()
36
37 slot = factory.make_one(
38 Slot,
39 type='open',
40- summit=summit)
41+ summit=self.summit)
42 slot.save()
43
44- room = factory.make_one(Room, summit=summit)
45- meeting = factory.make_one(Meeting, summit=summit, name='test-meeting', private=False)
46+ room = factory.make_one(Room, summit=self.summit)
47+ meeting = factory.make_one(Meeting, summit=self.summit, name='test-meeting', private=False)
48 agenda = factory.make_one(Agenda, slot=slot, meeting=meeting, room=room)
49
50 response = self.client.get('/uds-test/meeting/%s/test-meeting/' % meeting.id)
51 self.assertEquals(response.status_code, 200)
52 self.assertContains(response, 'http://pad.ubuntu.com/ep/pad/view/uds-test-test-meeting/latest', 1)
53
54-
55 class SchedulingConflictsTestCase(djangotest.TestCase):
56
57 def setUp(self):

Subscribers

People subscribed via source and target branches