Merged in [10418] from henrik@levkowetz.com:

Modified the test data to use some AD and WG chair names that contain non-ascii characters, and fixed test issues found.
 - Legacy-Id: 10420
Note: SVN reference [10418] has been migrated to Git commit cf7d794

Author: levkowetz

changelog

@@ -1,3 +1,35 @@
+ietfdb (6.8.0) ietf; urgency=medium
+
+  * Merged in [10414] from rjsparks@nostrum.com:
+    Put possibly replaces sections in the right columns. Fixes #1802.  
+
+  * Keep draft aliases for 2 years rather than 1 year from posting.
+
+  * Merged in [10405] from rjsparks@nostrum.com:
+    Addresses an issue where the WG document page would show the same document
+    in more than one section. Fixes #1827.  
+
+  * Merged in [10384] from rjsparks@nostrum.com:
+    When a group gives a document a new group state (particularly for the
+    first time), send a message that says what happened instead of simply
+    \'Adopted\'. Fixes #1830.  
+
+  * Merged in [10383] and [10413] from rcross@amsl.com:
+    Updated proceedings permissions.   
+
+  * Merged in [10379] from rjsparks@nostrum.com:
+    Change the acronym link on the html agenda page to go to the group's 
+    charter page rather than the charter's document page.  
+
+  * Merged in [10378] from rjsparks@nostrum.com:
+    Make the internal review message reflect whether this is a new chartering
+    effort or a recharter. Fixes #1814.  
+
+  * Fixed a unicode issue with rendering of contact names.
+
+ -- Henrik Levkowetz <henrik@levkowetz.com>  03 Nov 2015 23:44:55 -0800
+
+
 ietfdb (6.8.0) ietf; urgency=medium
 
   **IETF 94 Code Sprint**

debug.py

@@ -190,6 +190,7 @@ def info(name):
     if debug:
         frame = inspect.stack()[1][0]
         value = eval(name, frame.f_globals, frame.f_locals)
+        vtype = eval("type(%s)"%name, frame.f_globals, frame.f_locals)
         indent = ' ' * (_report_indent[0])
-        sys.stderr.write("%s%s: %s %s\n" % (indent, name, value, type(value)))
+        sys.stderr.write("%s%s: '%s' (%s)\n" % (indent, name, value, vtype))
 

ietf/doc/tests.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import datetime
 from pyquery import PyQuery
 
@@ -11,7 +12,7 @@
 from ietf.name.models import BallotPositionName
 from ietf.iesg.models import TelechatDate
 from ietf.person.models import Person
-from ietf.utils.test_utils import TestCase
+from ietf.utils.test_utils import TestCase, unicontent
 from ietf.utils.mail import outbox, empty_outbox
 from ietf.utils.test_data import make_test_data
 from ietf.utils.test_utils import login_testing_unauthorized
@@ -24,7 +25,7 @@ def test_edit_position(self):
                                                           ballot_id=draft.latest_event(BallotDocEvent, type="created_ballot").pk))
         login_testing_unauthorized(self, "ad", url)
 
-        ad = Person.objects.get(name="Aread Irector")
+        ad = Person.objects.get(name="Areað Irector")
 
         # normal get
         r = self.client.get(url)
@@ -84,7 +85,7 @@ def test_edit_position_as_secretary(self):
         draft = make_test_data()
         url = urlreverse('ietf.doc.views_ballot.edit_position', kwargs=dict(name=draft.name,
                                                           ballot_id=draft.latest_event(BallotDocEvent, type="created_ballot").pk))
-        ad = Person.objects.get(name="Aread Irector")
+        ad = Person.objects.get(name="Areað Irector")
         url += "?ad=%s" % ad.pk
         login_testing_unauthorized(self, "secretary", url)
 
@@ -127,7 +128,7 @@ def test_send_ballot_comment(self):
         draft.notify = "somebody@example.com"
         draft.save()
 
-        ad = Person.objects.get(name="Aread Irector")
+        ad = Person.objects.get(name="Areað Irector")
 
         ballot = draft.latest_event(BallotDocEvent, type="created_ballot")
 
@@ -263,7 +264,7 @@ def test_edit_ballot_writeup(self):
         q = PyQuery(r.content)
         self.assertEqual(len(q('textarea[name=ballot_writeup]')), 1)
         self.assertTrue(q('[type=submit]:contains("Save")'))
-        self.assertTrue("IANA does not" in r.content)
+        self.assertTrue("IANA does not" in unicontent(r))
 
         # save
         r = self.client.post(url, dict(
@@ -455,7 +456,7 @@ def helper_test_defer(self,name):
 
         e = TelechatDocEvent(type="scheduled_for_telechat",
                              doc = doc,
-                             by = Person.objects.get(name="Aread Irector"),
+                             by = Person.objects.get(name="Areað Irector"),
                              telechat_date = first_date,
                              returning_item = False, 
                             )
@@ -511,7 +512,7 @@ def helper_test_undefer(self,name):
 
         e = TelechatDocEvent(type="scheduled_for_telechat",
                              doc = doc,
-                             by = Person.objects.get(name="Aread Irector"),
+                             by = Person.objects.get(name="Areað Irector"),
                              telechat_date = second_date,
                              returning_item = True, 
                             )

ietf/doc/tests_ballot.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright The IETF Trust 2011, All Rights Reserved
 
 import os, shutil, datetime
@@ -13,7 +14,7 @@
 from ietf.group.models import Group, GroupMilestone
 from ietf.iesg.models import TelechatDate
 from ietf.person.models import Person
-from ietf.utils.test_utils import TestCase
+from ietf.utils.test_utils import TestCase, unicontent
 from ietf.utils.mail import outbox, empty_outbox
 from ietf.utils.test_data import make_test_data
 from ietf.utils.test_utils import login_testing_unauthorized
@@ -102,7 +103,7 @@ def find_event(t):
             if slug=="intrev":
                 self.assertTrue("Internal WG Review" in outbox[-3]['Subject'])
                 self.assertTrue(all([x in outbox[-3]['To'] for x in ['iab@','iesg@']]))
-                self.assertTrue("A new IETF working" in unicode(outbox[-3]))
+                self.assertTrue("A new IETF working" in outbox[-3].get_payload())
 
             self.assertTrue("state changed" in outbox[-2]['Subject'].lower())
             self.assertTrue("iesg-secretary@" in outbox[-2]['To'])
@@ -117,7 +118,7 @@ def find_event(t):
         empty_outbox()
         r = self.client.post(url, dict(charter_state=str(State.objects.get(used=True,type="charter",slug="intrev").pk), message="test"))
         self.assertEqual(r.status_code, 302)
-        self.assertTrue("A new charter" in unicode(outbox[-3]))
+        self.assertTrue("A new charter" in outbox[-3].get_payload())
 
     def test_edit_telechat_date(self):
         make_test_data()
@@ -262,7 +263,7 @@ def test_submit_charter(self):
 
         r = self.client.post(url, dict(txt=test_file))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("does not appear to be a text file" in r.content)
+        self.assertTrue("does not appear to be a text file" in unicontent(r))
 
         # post
         prev_rev = charter.rev
@@ -430,7 +431,7 @@ def test_approve(self):
         with open(os.path.join(self.charter_dir, "%s-%s.txt" % (charter.canonical_name(), charter.rev)), "w") as f:
             f.write("This is a charter.")
 
-        p = Person.objects.get(name="Aread Irector")
+        p = Person.objects.get(name="Areað Irector")
 
         BallotDocEvent.objects.create(
             type="created_ballot",
@@ -514,4 +515,4 @@ def test_charter_with_milestones(self):
         url = urlreverse('charter_with_milestones_txt', kwargs=dict(name=charter.name, rev=charter.rev))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(m.desc in r.content)
+        self.assertTrue(m.desc in unicontent(r))

ietf/doc/tests_charter.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import os
 import shutil
 
@@ -14,7 +15,7 @@
 from ietf.group.models import Person
 from ietf.iesg.models import TelechatDate
 from ietf.name.models import StreamName
-from ietf.utils.test_utils import TestCase
+from ietf.utils.test_utils import TestCase, unicontent
 from ietf.utils.mail import outbox, empty_outbox
 from ietf.utils.test_data  import make_test_data
 from ietf.utils.test_utils import login_testing_unauthorized
@@ -55,14 +56,14 @@ def test_start_review_as_secretary(self):
         self.assertEqual(Document.objects.filter(name='conflict-review-imaginary-independent-submission').count() , 0)
 
         # successful review start
-        ad_strpk = str(Person.objects.get(name='Aread Irector').pk)
+        ad_strpk = str(Person.objects.get(name='Areað Irector').pk)
         state_strpk = str(State.objects.get(used=True, slug='needshep',type__slug='conflrev').pk)        
         r = self.client.post(url,dict(ad=ad_strpk,create_in_state=state_strpk,notify='ipu@ietf.org'))
         self.assertEqual(r.status_code, 302)
         review_doc = Document.objects.get(name='conflict-review-imaginary-independent-submission')
         self.assertEqual(review_doc.get_state('conflrev').slug,'needshep')
         self.assertEqual(review_doc.rev,u'00')
-        self.assertEqual(review_doc.ad.name,u'Aread Irector')
+        self.assertEqual(review_doc.ad.name,u'Areað Irector')
         self.assertEqual(review_doc.notify,u'ipu@ietf.org')
         doc = Document.objects.get(name='draft-imaginary-independent-submission')
         self.assertTrue(doc in [x.target.document for x in review_doc.relateddocument_set.filter(relationship__slug='conflrev')])
@@ -72,7 +73,7 @@ def test_start_review_as_secretary(self):
         self.assertTrue('Conflict Review requested' in outbox[-1]['Subject'])
 
         # verify you can't start a review when a review is already in progress
-        r = self.client.post(url,dict(ad="Aread Irector",create_in_state="Needs Shepherd",notify='ipu@ietf.org'))
+        r = self.client.post(url,dict(ad="Areað Irector",create_in_state="Needs Shepherd",notify='ipu@ietf.org'))
         self.assertEqual(r.status_code, 404)
 
 
@@ -365,7 +366,7 @@ def test_subsequent_submission(self):
         test_file.name = "unnamed"
         r = self.client.post(url, dict(txt=test_file,submit_response="1"))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("does not appear to be a text file" in r.content)
+        self.assertTrue("does not appear to be a text file" in unicontent(r))
 
         # sane post uploading a file
         test_file = StringIO("This is a new proposal.")

ietf/doc/tests_conflict_review.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import os
 import shutil
 import datetime
@@ -18,7 +19,7 @@
 from ietf.person.models import Person, Email
 from ietf.meeting.models import Meeting, MeetingTypeName
 from ietf.iesg.models import TelechatDate
-from ietf.utils.test_utils import login_testing_unauthorized
+from ietf.utils.test_utils import login_testing_unauthorized, unicontent
 from ietf.utils.test_data import make_test_data
 from ietf.utils.mail import outbox, empty_outbox
 from ietf.utils.test_utils import TestCase
@@ -158,7 +159,7 @@ def test_request_last_call(self):
 
         self.assertTrue(not draft.latest_event(type="changed_ballot_writeup_text"))
         r = self.client.post(url, dict(state=State.objects.get(used=True, type="draft-iesg", slug="lc-req").pk))
-        self.assertTrue("Your request to issue" in r.content)
+        self.assertTrue("Your request to issue" in unicontent(r))
 
         # last call text
         e = draft.latest_event(WriteupDocEvent, type="changed_last_call_text")
@@ -353,7 +354,7 @@ def test_start_iesg_process_on_draft(self):
         events_before = draft.docevent_set.count()
         mailbox_before = len(outbox)
 
-        ad = Person.objects.get(name="Aread Irector")
+        ad = Person.objects.get(name="Areað Irector")
 
         r = self.client.post(url,
                              dict(intended_std_level=str(draft.intended_std_level_id),
@@ -446,7 +447,7 @@ def test_request_resurrect(self):
         self.assertEqual(draft.docevent_set.count(), events_before + 1)
         e = draft.latest_event(type="requested_resurrect")
         self.assertTrue(e)
-        self.assertEqual(e.by, Person.objects.get(name="Aread Irector"))
+        self.assertEqual(e.by, Person.objects.get(name="Areað Irector"))
         self.assertTrue("Resurrection" in e.desc)
         self.assertEqual(len(outbox), mailbox_before + 1)
         self.assertTrue("Resurrection" in outbox[-1]['Subject'])
@@ -458,7 +459,7 @@ def test_resurrect(self):
 
         DocEvent.objects.create(doc=draft,
                              type="requested_resurrect",
-                             by=Person.objects.get(name="Aread Irector"))
+                             by=Person.objects.get(name="Areað Irector"))
 
         url = urlreverse('doc_resurrect', kwargs=dict(name=draft.name))
 
@@ -905,7 +906,7 @@ def test_doc_change_shepherd(self):
         self.assertTrue(any(['Document shepherd changed to (None)' in x.desc for x in self.doc.docevent_set.filter(time=self.doc.time,type='added_comment')]))
 
         # test buggy change
-        ad = Person.objects.get(name='Aread Irector')
+        ad = Person.objects.get(name='Areað Irector')
         two_answers = "%s,%s" % (plain_email, ad.email_set.all()[0])
         r = self.client.post(url, dict(shepherd=two_answers))
         self.assertEqual(r.status_code, 200)

ietf/doc/tests_draft.py

@@ -15,7 +15,7 @@
 from ietf.meeting.models import Meeting, Session, SessionPresentation
 from ietf.name.models import SessionStatusName
 from ietf.person.models import Person
-from ietf.utils.test_utils import TestCase, login_testing_unauthorized
+from ietf.utils.test_utils import TestCase, login_testing_unauthorized, unicontent
 from ietf.utils.test_data import make_test_data
 
 from ietf.meeting.test_data import make_meeting_test_data
@@ -59,7 +59,7 @@ def test_choose_material_type(self):
         # normal get
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("Slides" in r.content)
+        self.assertTrue("Slides" in unicontent(r))
 
         url = urlreverse('ietf.doc.views_material.choose_material_type', kwargs=dict(acronym='mars'))
         r = self.client.get(url)

ietf/doc/tests_material.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import os
 import shutil
 
@@ -14,7 +15,7 @@
 from ietf.doc.views_status_change import default_approval_text
 from ietf.group.models import Person
 from ietf.iesg.models import TelechatDate
-from ietf.utils.test_utils import TestCase
+from ietf.utils.test_utils import TestCase, unicontent
 from ietf.utils.mail import outbox
 from ietf.utils.test_data  import make_test_data
 from ietf.utils.test_utils import login_testing_unauthorized
@@ -32,7 +33,7 @@ def test_start_review(self):
         q = PyQuery(r.content)
         self.assertEqual(len(q('form select[name=create_in_state]')),1)
 
-        ad_strpk = str(Person.objects.get(name='Aread Irector').pk)
+        ad_strpk = str(Person.objects.get(name='Areað Irector').pk)
         state_strpk = str(State.objects.get(slug='adrev',type__slug='statchg').pk)        
 
         # faulty posts
@@ -69,7 +70,7 @@ def test_start_review(self):
         status_change = Document.objects.get(name='status-change-imaginary-new')        
         self.assertEqual(status_change.get_state('statchg').slug,'adrev')
         self.assertEqual(status_change.rev,u'00')
-        self.assertEqual(status_change.ad.name,u'Aread Irector')
+        self.assertEqual(status_change.ad.name,u'Areað Irector')
         self.assertEqual(status_change.notify,u'ipu@ietf.org')
         self.assertTrue(status_change.relateddocument_set.filter(relationship__slug='tois',target__document__name='draft-ietf-random-thing'))
 
@@ -451,7 +452,7 @@ def test_subsequent_submission(self):
         test_file.name = "unnamed"
         r = self.client.post(url, dict(txt=test_file,submit_response="1"))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("does not appear to be a text file" in r.content)
+        self.assertTrue("does not appear to be a text file" in unicontent(r))
 
         # sane post uploading a file
         test_file = StringIO("This is a new proposal.")
@@ -476,7 +477,7 @@ def test_subsequent_submission(self):
         url = urlreverse('doc_view',kwargs=dict(name=doc.name,rev='00'))
         r = self.client.get(url)
         self.assertEqual(r.status_code,200)
-        self.assertTrue("This is the old proposal." in r.content)
+        self.assertTrue("This is the old proposal." in unicontent(r))
 
     def setUp(self):
         make_test_data()

ietf/doc/tests_status_change.py

@@ -42,8 +42,8 @@
     url(r'^(?P<name>[A-Za-z0-9\._\+\-]+)$', views_search.search_for_name, name="doc_search_for_name"),
     url(r'^search/$', views_search.search, name="doc_search"),
     url(r'^in-last-call/$', views_search.drafts_in_last_call, name="drafts_in_last_call"),
-    url(r'^ad/(?P<name>[A-Za-z0-9.-]+)/$', views_search.docs_for_ad, name="docs_for_ad"),
-    (r'^ad2/(?P<name>[A-Za-z0-9.-]+)/$', RedirectView.as_view(url='/doc/ad/%(name)s/', permanent=True)),
+    url(r'^ad/(?P<name>[\w.-]+)/$(?u)', views_search.docs_for_ad, name="docs_for_ad"),
+    (r'^ad2/(?P<name>[\w.-]+)/$(?u)', RedirectView.as_view(url='/doc/ad/%(name)s/', permanent=True)),
     url(r'^rfc-status-changes/$', views_status_change.rfc_status_changes, name='rfc_status_changes'),
     url(r'^start-rfc-status-change/(?P<name>[A-Za-z0-9._+-]*)$', views_status_change.start_rfc_status_change, name='start_rfc_status_change'), 
     url(r'^iesg/(?P<last_call_only>[A-Za-z0-9.-]+/)?$', views_search.drafts_in_iesg_process, name="drafts_in_iesg_process"),