Merge into trunk : csrf : Code : Summit

Status:	Merged
Approved by:	Michael Hall on 2013-03-08
Approved revision:	502
Merged at revision:	503
Proposed branch:	lp://staging/~cjohnston/summit/csrf
Merge into:	lp://staging/summit
Diff against target:	136 lines (+12/-8) 10 files modified summit/schedule/templates/schedule/attend.html (+1/-1) summit/schedule/templates/schedule/create_meeting.html (+1/-1) summit/schedule/templates/schedule/edit_hangout.html (+1/-1) summit/schedule/templates/schedule/edit_meeting.html (+1/-1) summit/schedule/templates/schedule/meeting_review.html (+1/-1) summit/schedule/templates/schedule/org_attend.html (+1/-1) summit/schedule/templates/schedule/org_edit_meeting.html (+1/-1) summit/schedule/templates/schedule/propose_meeting.html (+1/-1) summit/schedule/views.py (+3/-0) summit/settings.py (+1/-0)
To merge this branch:	bzr merge lp://staging/~cjohnston/summit/csrf
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Michael Hall (community)		2013-03-07	Approve on 2013-03-08
Review via email: mp+152298@code.staging.launchpad.net

Commit message

Adds csrf tokens to the schedule app in an attempt to prepare for 1.4

Revision history for this message

Michael Hall (mhall119) wrote on 2013-03-08:

#

Download full text (5.4 KiB)

======================================================================
ERROR: test_cache_cleared_on_agenda_change (summit.schedule.tests.schedule_cache.ScheduleCacheTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/mhall/projects/Ubuntu/summit/current_work/summit/../summit/schedule/tests/schedule_cache.py", line 154, in test_cache_cleared_on_agenda_change
''
TypeError: argument of type 'NoneType' is not iterable

======================================================================
ERROR: test_cache_cleared_on_meeting_change (summit.schedule.tests.schedule_cache.ScheduleCacheTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
File "/home/mhall/projects/Ubuntu/summit/current_work/summit/../summit/schedule/tests/schedule_cache.py", line 133, in test_cache_cleared_on_meeting_change
''
TypeError: argument of type 'NoneType' is not iterable

======================================================================
FAIL: test_percent_in_meeting_name (summit.schedule.tests.render_schedule.RenderScheduleTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/mhall/projects/Ubuntu/summit/current_work/summit/../summit/schedule/tests/render_schedule.py", line 120, in test_percent_in_meeting_name
    self.assertContains(response, 'test%meeting', 1)
  File "/home/mhall/projects/Ubuntu/summit/current_work/env/local/lib/python2.7/site-packages/django/test/testcases.py", line 427, in assertContains
    " (expected %d)" % (real_count, text, count))
AssertionError: Found 0 instances of 'test%meeting' in response (expected 1)

======================================================================
FAIL: test_percent_in_meeting_title (summit.schedule.tests.render_schedule.RenderScheduleTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/mhall/projects/Ubuntu/summit/current_work/summit/../summit/schedule/tests/render_schedule.py", line 128, in test_percent_in_meeting_title
    self.assertContains(response, 'test % meeting', 1)
  File "/home/mhall/projects/Ubuntu/summit/current_work/env/local/lib/python2.7/site-packages/django/test/testcases.py", line 427, in assertContains
    " (expected %d)" % (real_count, text, count))
AssertionError: Found 0 instances of 'test % meeting' in response (expected 1)

======================================================================
FAIL: test_percent_in_meeting_track_slug (summit.schedule.tests.render_schedule.RenderScheduleTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/mhall/projects/Ubuntu/summit/current_work/summit/../summit/schedule/tests/render_schedule.py", line 159, in test_percent_in_meeting_track_slug
    self.assertContains(response, 'test%track', 1)
  File "/home/mhall/projects/Ubuntu/summit/current_work/env/local/lib/python2.7/site-packages/django/test/testcases.py", line 427, in assertContains
    " (expected %d)" % (real_count, text...

======================================================================
ERROR: test_cache_cleared_on_agenda_change (summit.schedule.tests.schedule_cache.ScheduleCacheTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/mhall/projects/Ubuntu/summit/current_work/summit/../summit/schedule/tests/schedule_cache.py", line 154, in test_cache_cleared_on_agenda_change
    ''
TypeError: argument of type 'NoneType' is not iterable

======================================================================
ERROR: test_cache_cleared_on_meeting_change (summit.schedule.tests.schedule_cache.ScheduleCacheTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/mhall/projects/Ubuntu/summit/current_work/summit/../summit/schedule/tests/schedule_cache.py", line 133, in test_cache_cleared_on_meeting_change
    ''
TypeError: argument of type 'NoneType' is not iterable

======================================================================
FAIL: test_percent_in_meeting_name (summit.schedule.tests.render_schedule.RenderScheduleTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/mhall/projects/Ubuntu/summit/current_work/summit/../summit/schedule/tests/render_schedule.py", line 120, in test_percent_in_meeting_name
    self.assertContains(response, 'test%meeting', 1)
  File "/home/mhall/projects/Ubuntu/summit/current_work/env/local/lib/python2.7/site-packages/django/test/testcases.py", line 427, in assertContains
    " (expected %d)" % (real_count, text, count))
AssertionError: Found 0 instances of 'test%meeting' in response (expected 1)

======================================================================
FAIL: test_percent_in_meeting_title (summit.schedule.tests.render_schedule.RenderScheduleTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/mhall/projects/Ubuntu/summit/current_work/summit/../summit/schedule/tests/render_schedule.py", line 128, in test_percent_in_meeting_title
    self.assertContains(response, 'test % meeting', 1)
  File "/home/mhall/projects/Ubuntu/summit/current_work/env/local/lib/python2.7/site-packages/django/test/testcases.py", line 427, in assertContains
    " (expected %d)" % (real_count, text, count))
AssertionError: Found 0 instances of 'test % meeting' in response (expected 1)

======================================================================
FAIL: test_percent_in_meeting_track_slug (summit.schedule.tests.render_schedule.RenderScheduleTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/mhall/projects/Ubuntu/summit/current_work/summit/../summit/schedule/tests/render_schedule.py", line 159, in test_percent_in_meeting_track_slug
    self.assertContains(response, 'test%track', 1)
  File "/home/mhall/projects/Ubuntu/summit/current_work/env/local/lib/python2.7/site-packages/django/test/testcases.py", line 427, in assertContains
    " (expected %d)" % (real_count, text, count))
AssertionError: Found 0 instances of 'test%track' in response (expected 1)

======================================================================
FAIL: test_percent_in_meeting_track_title (summit.schedule.tests.render_schedule.RenderScheduleTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/mhall/projects/Ubuntu/summit/current_work/summit/../summit/schedule/tests/render_schedule.py", line 150, in test_percent_in_meeting_track_title
    self.assertContains(response, 'test % track', 1)
  File "/home/mhall/projects/Ubuntu/summit/current_work/env/local/lib/python2.7/site-packages/django/test/testcases.py", line 427, in assertContains
    " (expected %d)" % (real_count, text, count))
AssertionError: Found 0 instances of 'test % track' in response (expected 1)

======================================================================
FAIL: test_percent_in_room_title (summit.schedule.tests.render_schedule.RenderScheduleTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/mhall/projects/Ubuntu/summit/current_work/summit/../summit/schedule/tests/render_schedule.py", line 141, in test_percent_in_room_title
    self.assertContains(response, 'test % room', 4)
  File "/home/mhall/projects/Ubuntu/summit/current_work/env/local/lib/python2.7/site-packages/django/test/testcases.py", line 427, in assertContains
    " (expected %d)" % (real_count, text, count))
AssertionError: Found 0 instances of 'test % room' in response (expected 4)

======================================================================
FAIL: test_specify_rooms_in_schedule (summit.schedule.tests.render_schedule.RenderScheduleTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/mhall/projects/Ubuntu/summit/current_work/summit/../summit/schedule/tests/render_schedule.py", line 179, in test_specify_rooms_in_schedule
    self.assertContains(response, self.room1.title, 2)
  File "/home/mhall/projects/Ubuntu/summit/current_work/env/local/lib/python2.7/site-packages/django/test/testcases.py", line 427, in assertContains
    " (expected %d)" % (real_count, text, count))
AssertionError: Found 0 instances of 'Room 1' in response (expected 2)

review: Needs Fixing

Revision history for this message

Michael Hall (mhall119) wrote on 2013-03-08:

#

Fixed my local environment, everything passes now, looks good

review: Approve

Summit

Merge lp://staging/~cjohnston/summit/csrf into lp://staging/summit

Commit message

Description of the change

Preview Diff

Subscribers