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
@@ -9,6 +9,74 @@ import unittest
|
||||
m=runpy.run_path(str(Path(__file__).with_name('pages')))
|
||||
|
||||
class ProductivityTests(unittest.TestCase):
|
||||
def test_deleted_capture_message_retains_draft_without_retry_loop(self):
|
||||
ident='b5550cab-22d4-54eb-b06d-3b432d3f5101'
|
||||
original={'request_id':ident,'title':'Private title','notes':'Private notes'}
|
||||
for status,code,message in [(410,'deleted','--recreate-deleted'),(409,'capture_missing','consistency repair'),(412,'conflict','unchanged retry'),(409,'note_exists','not overwritten')]:
|
||||
profile=SimpleNamespace(data={'task_outbox':{ident:original.copy()}},save=lambda:None)
|
||||
calls=[]
|
||||
def send(*args,**kw):
|
||||
calls.append(kw)
|
||||
raise m['Failure']('old generic message',status,{'error':code})
|
||||
output=io.StringIO()
|
||||
with contextlib.redirect_stderr(output),self.assertRaises(m['Failure']) as error:
|
||||
m['tasks'](SimpleNamespace(json=send),profile,['retry',ident])
|
||||
self.assertIn(message,str(error.exception))
|
||||
self.assertNotIn('Private',str(error.exception)+output.getvalue())
|
||||
self.assertNotIn('retry with:',output.getvalue())
|
||||
self.assertEqual(profile.data['task_outbox'][ident],original)
|
||||
self.assertEqual(len(calls),1)
|
||||
|
||||
def test_recreate_deleted_persists_successor_and_retries_same_id(self):
|
||||
import uuid
|
||||
ident='b5550cab-22d4-54eb-b06d-3b432d3f5101'
|
||||
replacement=str(uuid.uuid5(uuid.NAMESPACE_URL,'pages:task-recreate:'+ident))
|
||||
payload={'request_id':ident,'title':'Private title','wiki_body':'Private body','wiki_suffix':'2030/01/'+ident}
|
||||
saved,calls=[],[]
|
||||
profile=SimpleNamespace(data={'task_outbox':{ident:payload.copy()}})
|
||||
profile.save=lambda:saved.append(json.loads(json.dumps(profile.data)))
|
||||
def send(route,**kw):
|
||||
calls.append(kw['data'].copy())
|
||||
self.assertEqual(saved[-1]['task_outbox'][replacement],kw['data'])
|
||||
self.assertNotIn(ident,saved[-1]['task_outbox'])
|
||||
if len(calls)==1:raise m['Failure']('Connection lost')
|
||||
return {'item':{'uuid':replacement}}
|
||||
output,error=io.StringIO(),io.StringIO()
|
||||
with contextlib.redirect_stdout(output),contextlib.redirect_stderr(error):
|
||||
with self.assertRaises(m['Failure']):m['tasks'](SimpleNamespace(json=send),profile,['retry',ident,'--recreate-deleted'])
|
||||
self.assertEqual(len(profile.data['task_outbox']),1)
|
||||
m['tasks'](SimpleNamespace(json=send),profile,['retry',replacement])
|
||||
self.assertEqual(calls[0],calls[1])
|
||||
self.assertEqual(calls[0]['request_id'],replacement)
|
||||
self.assertEqual(calls[0]['replaces_deleted'],ident)
|
||||
self.assertEqual(calls[0]['wiki_suffix'],payload['wiki_suffix'])
|
||||
self.assertEqual(calls[0]['wiki_body'],payload['wiki_body'])
|
||||
self.assertEqual(profile.data['task_outbox'],{})
|
||||
self.assertIn(replacement,error.getvalue())
|
||||
self.assertNotIn('Private',error.getvalue())
|
||||
|
||||
def test_recreate_deleted_save_failure_keeps_original_and_sends_nothing(self):
|
||||
ident='b5550cab-22d4-54eb-b06d-3b432d3f5101'
|
||||
payload={'request_id':ident,'title':'Draft'}
|
||||
def fail():raise m['Failure']('disk full')
|
||||
profile=SimpleNamespace(data={'task_outbox':{ident:payload.copy()}},save=fail)
|
||||
calls=[]
|
||||
with self.assertRaises(m['Failure']):m['tasks'](SimpleNamespace(json=lambda *a,**kw:calls.append(kw)),profile,['retry',ident,'--recreate-deleted'])
|
||||
self.assertEqual(calls,[])
|
||||
self.assertEqual(profile.data['task_outbox'],{ident:payload})
|
||||
|
||||
def test_recreate_deleted_never_clobbers_different_successor_draft(self):
|
||||
import uuid
|
||||
ident='b5550cab-22d4-54eb-b06d-3b432d3f5101'
|
||||
replacement=str(uuid.uuid5(uuid.NAMESPACE_URL,'pages:task-recreate:'+ident))
|
||||
pending={ident:{'request_id':ident,'title':'Original'},replacement:{'request_id':replacement,'title':'Different'}}
|
||||
before=json.loads(json.dumps(pending))
|
||||
calls=[]
|
||||
profile=SimpleNamespace(data={'task_outbox':pending},save=lambda:calls.append('save'))
|
||||
with self.assertRaises(m['Failure']):m['tasks'](SimpleNamespace(json=lambda *a,**kw:calls.append('send')),profile,['retry',ident,'--recreate-deleted'])
|
||||
self.assertEqual(calls,[])
|
||||
self.assertEqual(pending,before)
|
||||
|
||||
def test_mail_path_priority_and_dates(self):
|
||||
import datetime,hashlib
|
||||
ident='06cb3a24-61f8-4a9f-a0bf-89eea9632f25'
|
||||
@@ -24,7 +92,7 @@ class ProductivityTests(unittest.TestCase):
|
||||
raw=b'Subject: [../unsafe 123] Title\r\n'+date+b'\r\nbody'
|
||||
self.assertEqual(suffix(raw,ident,now),'2030/02/'+hashlib.sha256(raw).hexdigest())
|
||||
|
||||
def test_pending_mail_month_and_options_are_preserved(self):
|
||||
def test_pending_mail_keeps_month_but_replaces_changed_options(self):
|
||||
from unittest.mock import patch
|
||||
raw=b'Subject: Test\r\nMessage-ID: <same@example.invalid>\r\n\r\nbody'
|
||||
calls=[]
|
||||
@@ -37,10 +105,86 @@ class ProductivityTests(unittest.TestCase):
|
||||
with patch.dict(m['tasks'].__globals__,task_mail_suffix=lambda raw,ident:month+'/'+ident),patch('sys.stdin',SimpleNamespace(buffer=io.BytesIO(raw))),contextlib.redirect_stderr(io.StringIO()),self.assertRaises(m['Failure']):
|
||||
m['tasks'](client,profile,['from-mail'])
|
||||
self.assertEqual(calls[0],calls[1])
|
||||
with patch('sys.stdin',SimpleNamespace(buffer=io.BytesIO(raw))),self.assertRaises(m['Failure']):
|
||||
with patch('sys.stdin',SimpleNamespace(buffer=io.BytesIO(raw))),contextlib.redirect_stderr(io.StringIO()),self.assertRaises(m['Failure']):
|
||||
m['tasks'](client,profile,['from-mail','--wiki-prefix','/changed'])
|
||||
self.assertEqual(len(calls),2)
|
||||
self.assertEqual(next(iter(profile.data['task_outbox'].values())),calls[0])
|
||||
self.assertEqual(len(calls),3)
|
||||
self.assertEqual(calls[2]['request_id'],calls[0]['request_id'])
|
||||
self.assertEqual(calls[2]['wiki_prefix'],'/changed')
|
||||
self.assertEqual(next(iter(profile.data['task_outbox'].values())),calls[2])
|
||||
|
||||
def test_changed_capture_is_saved_before_send_and_retained_on_conflict(self):
|
||||
ident='b5550cab-22d4-54eb-b06d-3b432d3f5101'
|
||||
saved,calls=[],[]
|
||||
old={'request_id':ident,'title':'Old draft','notes':'Old private notes'}
|
||||
profile=SimpleNamespace(data={'task_outbox':{ident:old}})
|
||||
profile.save=lambda:saved.append(json.loads(json.dumps(profile.data)))
|
||||
def send(route,**kw):
|
||||
payload=kw['data'].copy();calls.append(payload)
|
||||
self.assertEqual(saved[-1]['task_outbox'][ident],payload)
|
||||
if len(calls)==1:raise m['Failure']('conflict',412,{'error':'conflict'})
|
||||
return {'item':{'uuid':ident}}
|
||||
client=SimpleNamespace(json=send)
|
||||
out,err=io.StringIO(),io.StringIO()
|
||||
with contextlib.redirect_stdout(out),contextlib.redirect_stderr(err):
|
||||
with self.assertRaises(m['Failure']) as failure:
|
||||
m['tasks'](client,profile,['add','New draft','--request-id',ident,'--notes','New private notes'])
|
||||
self.assertEqual(failure.exception.status,412)
|
||||
self.assertEqual(profile.data['task_outbox'][ident],calls[0])
|
||||
self.assertEqual(len(calls),1) # No automatic server overwrite/retry.
|
||||
m['tasks'](client,profile,['retry',ident])
|
||||
self.assertEqual(calls[0],calls[1])
|
||||
self.assertEqual(calls[0]['title'],'New draft')
|
||||
self.assertEqual(profile.data['task_outbox'],{})
|
||||
self.assertIn('Replaced the retained draft',err.getvalue())
|
||||
self.assertNotIn('private notes',err.getvalue())
|
||||
self.assertEqual(json.loads(out.getvalue())['item']['uuid'],ident)
|
||||
|
||||
def test_replacing_draft_does_not_send_when_local_save_fails(self):
|
||||
ident='b5550cab-22d4-54eb-b06d-3b432d3f5101'
|
||||
def fail_save():raise m['Failure']('local write failed')
|
||||
profile=SimpleNamespace(data={'task_outbox':{ident:{'request_id':ident,'title':'Old','notes':''}}},save=fail_save)
|
||||
calls=[]
|
||||
client=SimpleNamespace(json=lambda *a,**kw:calls.append(kw))
|
||||
with self.assertRaises(m['Failure']):m['tasks'](client,profile,['add','New','--request-id',ident])
|
||||
self.assertEqual(calls,[])
|
||||
|
||||
def test_full_outbox_allows_replacement_but_not_new_id(self):
|
||||
import uuid
|
||||
pending={str(uuid.uuid4()):{'title':'Old'} for _ in range(20)}
|
||||
ident=next(iter(pending))
|
||||
profile=SimpleNamespace(data={'task_outbox':pending},save=lambda:None)
|
||||
calls=[]
|
||||
def send(route,**kw):
|
||||
calls.append(kw['data'].copy())
|
||||
raise m['Failure']('offline')
|
||||
client=SimpleNamespace(json=send)
|
||||
with contextlib.redirect_stderr(io.StringIO()),self.assertRaises(m['Failure']):
|
||||
m['tasks'](client,profile,['add','Replacement','--request-id',ident])
|
||||
self.assertEqual(len(calls),1)
|
||||
self.assertEqual(pending[ident]['title'],'Replacement')
|
||||
with self.assertRaises(m['Failure']):m['tasks'](client,profile,['add','Another'])
|
||||
self.assertEqual(len(calls),1)
|
||||
self.assertEqual(len(pending),20)
|
||||
|
||||
def test_reimported_mail_replaces_body_and_removes_obsolete_options(self):
|
||||
from unittest.mock import patch
|
||||
raw=b'Subject: Old\r\nMessage-ID: <same@example.invalid>\r\n\r\nOLD BODY'
|
||||
calls=[]
|
||||
def send(route,**kw):
|
||||
calls.append(kw['data'].copy())
|
||||
raise m['Failure']('offline')
|
||||
client=SimpleNamespace(base='https://example.invalid',json=send)
|
||||
profile=SimpleNamespace(data={'username':'test'},save=lambda:None)
|
||||
changed=raw.replace(b'Subject: Old',b'Subject: New').replace(b'OLD BODY',b'NEW BODY')
|
||||
for mail,args in [(raw,['--wiki-prefix','/old']),(changed,['--wiki-prefix','/new']),(changed,['--metadata-only'])]:
|
||||
with patch('sys.stdin',SimpleNamespace(buffer=io.BytesIO(mail))),contextlib.redirect_stderr(io.StringIO()),self.assertRaises(m['Failure']):
|
||||
m['tasks'](client,profile,['from-mail',*args])
|
||||
self.assertEqual(len({c['request_id'] for c in calls}),1)
|
||||
self.assertEqual(calls[1]['title'],'New')
|
||||
self.assertIn('NEW BODY',calls[1]['wiki_body'])
|
||||
self.assertNotIn('OLD BODY',calls[1]['wiki_body'])
|
||||
for key in ('wiki_body','wiki_prefix','wiki_suffix'):self.assertNotIn(key,calls[2])
|
||||
self.assertEqual(next(iter(profile.data['task_outbox'].values())),calls[2])
|
||||
|
||||
def test_mail_privacy_and_long_subject_override(self):
|
||||
raw=b'Subject: Test\r\nFrom: Person <person@example.invalid>\r\nMessage-ID: <id@example.invalid>\r\nContent-Type: text/plain; charset=utf-8\r\n\r\nPRIVATE BODY'
|
||||
|
||||
Reference in new issue
Block a user