Skip to content

Commit a174f43

Browse files
fix: use current time for bofreq revisions (#10333)
* fix: use current time for bofreq revisions * test: test time handling Adjusts assertion argument order to match our usual style
1 parent 33fe0bc commit a174f43

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

ietf/doc/tests_bofreq.py

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -307,17 +307,20 @@ def test_submit(self):
307307
url = urlreverse('ietf.doc.views_bofreq.submit', kwargs=dict(name=doc.name))
308308

309309
rev = doc.rev
310+
doc_time = doc.time
310311
r = self.client.post(url,{'bofreq_submission':'enter','bofreq_content':'# oiwefrase'})
311312
self.assertEqual(r.status_code, 302)
312313
doc = reload_db_objects(doc)
313-
self.assertEqual(rev, doc.rev)
314+
self.assertEqual(doc.rev, rev)
315+
self.assertEqual(doc.time, doc_time)
314316

315317
nobody = PersonFactory()
316318
self.client.login(username=nobody.user.username, password=nobody.user.username+'+password')
317319
r = self.client.post(url,{'bofreq_submission':'enter','bofreq_content':'# oiwefrase'})
318320
self.assertEqual(r.status_code, 403)
319321
doc = reload_db_objects(doc)
320-
self.assertEqual(rev, doc.rev)
322+
self.assertEqual(doc.rev, rev)
323+
self.assertEqual(doc.time, doc_time)
321324
self.client.logout()
322325

323326
editor = bofreq_editors(doc).first()
@@ -339,12 +342,14 @@ def test_submit(self):
339342
r = self.client.post(url, postdict)
340343
self.assertEqual(r.status_code, 302)
341344
doc = reload_db_objects(doc)
342-
self.assertEqual('%02d'%(int(rev)+1) ,doc.rev)
343-
self.assertEqual(f'# {username}', doc.text())
344-
self.assertEqual(f'# {username}', retrieve_str('bofreq',doc.get_base_name()))
345-
self.assertEqual(docevent_count+1, doc.docevent_set.count())
346-
self.assertEqual(1, len(outbox))
345+
self.assertEqual(doc.rev, '%02d'%(int(rev)+1))
346+
self.assertGreater(doc.time, doc_time)
347+
self.assertEqual(doc.text(), f'# {username}')
348+
self.assertEqual(retrieve_str('bofreq', doc.get_base_name()), f'# {username}')
349+
self.assertEqual(doc.docevent_set.count(), docevent_count+1)
350+
self.assertEqual(len(outbox), 1)
347351
rev = doc.rev
352+
doc_time = doc.time
348353
finally:
349354
os.unlink(file.name)
350355

ietf/doc/views_bofreq.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ def submit(request, name):
9191
by=request.user.person,
9292
rev=bofreq.rev,
9393
desc='New revision available',
94-
time=bofreq.time,
9594
)
9695
bofreq.save_with_history([e])
9796
bofreq_submission = form.cleaned_data['bofreq_submission']

0 commit comments

Comments
 (0)