fix(tasks): recover deleted captures without reviving tombstones
This commit is contained in:
1 parent
43a2d8c5a1
commit
4049acf76e
10 files changed
+594
-28
No files matched your search
@@ -5,6 +5,7 @@ import json
|
||||
from pathlib import Path
|
||||
import runpy
|
||||
import sys
|
||||
import uuid
|
||||
from types import SimpleNamespace
|
||||
from unittest.mock import patch
|
||||
from email.message import EmailMessage
|
||||
@@ -61,5 +62,50 @@ def run():
|
||||
output=io.StringIO()
|
||||
with contextlib.redirect_stdout(output):m['contacts'](client,['export',contact['uuid']])
|
||||
assert 'UID:urn:test:cli' in output.getvalue()
|
||||
# Failed captures can be replaced locally; committed receipts remain protected.
|
||||
request_id=str(uuid.uuid4())
|
||||
with contextlib.redirect_stderr(io.StringIO()):
|
||||
try:task('add','Rejected draft','--request-id',request_id,'--estimate','-1')
|
||||
except m['Failure'] as error:assert error.status==422
|
||||
else:raise AssertionError('Invalid estimate accepted')
|
||||
assert profile.data['task_outbox'][request_id]['estimate_minutes']==-1
|
||||
corrected=task('add','Corrected draft','--request-id',request_id,'--estimate','15')['item']
|
||||
assert corrected['uuid']==request_id and corrected['title']=='Corrected draft'
|
||||
assert request_id not in profile.data['task_outbox']
|
||||
try:task('add','Changed after commit','--request-id',request_id,'--estimate','30')
|
||||
except m['Failure'] as error:assert error.status==412
|
||||
else:raise AssertionError('Committed capture silently overwritten')
|
||||
assert profile.data['task_outbox'][request_id]['title']=='Changed after commit'
|
||||
stored=task('show',request_id)['item']
|
||||
assert stored['title']=='Corrected draft' and stored['estimate_minutes']==15
|
||||
# Deleted receipts must not be mistaken for editable conflicts. An
|
||||
# explicit recreation preserves the old tombstone and changes identity.
|
||||
client.request(m['TASK_API']+'items/'+request_id,method='DELETE',etag='"'+str(stored['version'])+'"')
|
||||
with contextlib.redirect_stderr(io.StringIO()):
|
||||
try:task('retry',request_id)
|
||||
except m['Failure'] as error:
|
||||
assert error.status==410 and '--recreate-deleted' in str(error)
|
||||
else:raise AssertionError('Deleted task implicitly recreated')
|
||||
recreated=task('retry',request_id,'--recreate-deleted')['item']
|
||||
replacement=str(uuid.uuid5(uuid.NAMESPACE_URL,'pages:task-recreate:'+request_id))
|
||||
assert recreated['uuid']==replacement and recreated['title']=='Changed after commit'
|
||||
assert recreated['estimate_minutes']==30 and not profile.data.get('task_outbox')
|
||||
try:task('show',request_id)
|
||||
except m['Failure'] as error:assert error.status==404
|
||||
else:raise AssertionError('Deleted UUID resurrected')
|
||||
# Reimport a deleted mail with a changed body: reconnect the surviving
|
||||
# Wiki note, without overwriting its independent content or revision.
|
||||
mail_id=captured['item']['uuid']
|
||||
client.request(m['TASK_API']+'items/'+mail_id,method='DELETE',etag='"1"')
|
||||
changed_mail=mail.replace(b'Private mail body',b'Changed private body')
|
||||
with patch('sys.stdin',SimpleNamespace(buffer=io.BytesIO(changed_mail))),contextlib.redirect_stderr(io.StringIO()):
|
||||
try:task('from-mail')
|
||||
except m['Failure'] as error:assert error.status==410
|
||||
else:raise AssertionError('Deleted mail task recreated implicitly')
|
||||
with contextlib.redirect_stderr(io.StringIO()):recreated_mail=task('retry',mail_id,'--recreate-deleted')
|
||||
assert recreated_mail['item']['page_uuid']==captured['item']['page_uuid']
|
||||
assert recreated_mail['page_path']==captured['page_path']
|
||||
body,_=client.raw('path:'+recreated_mail['page_path'])
|
||||
assert 'Private mail body' in body.decode() and 'Changed private body' not in body.decode()
|
||||
|
||||
if __name__=='__main__':run()
|
||||
Reference in new issue
Block a user