Merge pull request #150 from PR0M3TH3AN/codex/update-tests-to-use-new-api-methods

Update tests for snapshot API
This commit is contained in:
thePR0M3TH3AN
2025-07-02 17:14:25 -04:00
committed by GitHub
10 changed files with 87 additions and 48 deletions

View File

@@ -57,7 +57,7 @@ def test_encryption_mode_migration(monkeypatch, start_mode, new_mode):
pm.current_fingerprint = "fp"
pm.parent_seed = TEST_SEED
pm.encryption_mode = start_mode
pm.nostr_client = SimpleNamespace(publish_json_to_nostr=lambda *a, **k: None)
pm.nostr_client = SimpleNamespace(publish_snapshot=lambda *a, **k: None)
monkeypatch.setattr(
"password_manager.manager.prompt_existing_password",
@@ -65,9 +65,7 @@ def test_encryption_mode_migration(monkeypatch, start_mode, new_mode):
)
monkeypatch.setattr(
"password_manager.manager.NostrClient",
lambda *a, **kw: SimpleNamespace(
publish_json_to_nostr=lambda *a, **k: None
),
lambda *a, **kw: SimpleNamespace(publish_snapshot=lambda *a, **k: None),
)
pm.change_encryption_mode(new_mode)

View File

@@ -20,9 +20,8 @@ class FakeNostrClient:
def __init__(self, *args, **kwargs):
self.published = []
def publish_json_to_nostr(self, data: bytes):
def publish_snapshot(self, data: bytes):
self.published.append(data)
return True
def test_manager_workflow(monkeypatch):

View File

@@ -1,7 +1,8 @@
import sys
from pathlib import Path
from tempfile import TemporaryDirectory
from unittest.mock import patch
from unittest.mock import patch, AsyncMock
import asyncio
from helpers import create_vault, TEST_SEED, TEST_PASSWORD
sys.path.append(str(Path(__file__).resolve().parents[1]))
@@ -23,7 +24,8 @@ def test_backup_and_publish_to_nostr():
assert encrypted_index is not None
with patch(
"nostr.client.NostrClient.publish_json_to_nostr", return_value=True
"nostr.client.NostrClient.publish_snapshot",
AsyncMock(return_value=None),
) as mock_publish, patch("nostr.client.ClientBuilder"), patch(
"nostr.client.KeyManager"
), patch.object(
@@ -33,7 +35,7 @@ def test_backup_and_publish_to_nostr():
):
nostr_client = NostrClient(enc_mgr, "fp")
entry_mgr.backup_index_file()
result = nostr_client.publish_json_to_nostr(encrypted_index)
result = asyncio.run(nostr_client.publish_snapshot(encrypted_index))
mock_publish.assert_called_with(encrypted_index)
assert result is True
mock_publish.assert_awaited_with(encrypted_index)
assert result is None

View File

@@ -1,12 +1,14 @@
import sys
from pathlib import Path
from unittest.mock import patch
import asyncio
import gzip
from cryptography.fernet import Fernet
sys.path.append(str(Path(__file__).resolve().parents[1]))
from password_manager.encryption import EncryptionManager
from nostr.client import NostrClient
from nostr.client import NostrClient, Manifest
class MockNostrServer:
@@ -17,6 +19,7 @@ class MockNostrServer:
class MockClient:
def __init__(self, server):
self.server = server
self.pos = -1
async def add_relays(self, relays):
pass
@@ -44,14 +47,17 @@ class MockClient:
return FakeOutput()
async def fetch_events(self, filter_obj, timeout):
ev = self.server.events[self.pos]
self.pos -= 1
class FakeEvents:
def __init__(self, events):
self._events = events
def __init__(self, event):
self._event = event
def to_vec(self):
return self._events
return [self._event]
return FakeEvents(self.server.events[-1:])
return FakeEvents(ev)
def setup_client(tmp_path, server):
@@ -72,5 +78,6 @@ def test_publish_and_retrieve(tmp_path):
server = MockNostrServer()
client = setup_client(tmp_path, server)
payload = b"contract-test"
assert client.publish_json_to_nostr(payload) is True
assert client.retrieve_json_from_nostr_sync() == payload
asyncio.run(client.publish_snapshot(payload))
manifest, chunks = asyncio.run(client.fetch_latest_snapshot())
assert gzip.decompress(b"".join(chunks)) == payload

View File

@@ -3,6 +3,8 @@ import time
from pathlib import Path
from tempfile import TemporaryDirectory
from unittest.mock import patch
import asyncio
import gzip
import sys
import uuid
@@ -58,21 +60,28 @@ def test_nostr_index_size_limits():
encrypted = vault.get_encrypted_index()
payload_size = len(encrypted) if encrypted else 0
published = client.publish_json_to_nostr(encrypted or b"")
asyncio.run(client.publish_snapshot(encrypted or b""))
time.sleep(delay)
retrieved = client.retrieve_json_from_nostr_sync()
result = asyncio.run(client.fetch_latest_snapshot())
retrieved = gzip.decompress(b"".join(result[1])) if result else None
retrieved_ok = retrieved == encrypted
if not retrieved_ok:
print(f"Initial retrieve failed: {client.last_error}")
retrieved = client.retrieve_json_from_nostr_sync(retries=1)
result = asyncio.run(client.fetch_latest_snapshot())
retrieved = (
gzip.decompress(b"".join(result[1])) if result else None
)
retrieved_ok = retrieved == encrypted
if not retrieved_ok:
print("Trying alternate relay")
client.update_relays(["wss://relay.damus.io"])
retrieved = client.retrieve_json_from_nostr_sync(retries=1)
result = asyncio.run(client.fetch_latest_snapshot())
retrieved = (
gzip.decompress(b"".join(result[1])) if result else None
)
retrieved_ok = retrieved == encrypted
results.append((entry_count, payload_size, published, retrieved_ok))
if not published or not retrieved_ok or payload_size > max_payload:
results.append((entry_count, payload_size, True, retrieved_ok))
if not retrieved_ok or payload_size > max_payload:
break
size *= 2
except Exception:

View File

@@ -4,6 +4,8 @@ import time
from pathlib import Path
from tempfile import TemporaryDirectory
from unittest.mock import patch
import asyncio
import gzip
import uuid
import pytest
@@ -31,8 +33,9 @@ def test_nostr_publish_and_retrieve():
relays=["wss://relay.snort.social"],
)
payload = b"seedpass"
assert client.publish_json_to_nostr(payload) is True
asyncio.run(client.publish_snapshot(payload))
time.sleep(2)
retrieved = client.retrieve_json_from_nostr_sync()
result = asyncio.run(client.fetch_latest_snapshot())
retrieved = gzip.decompress(b"".join(result[1])) if result else None
client.close_client_pool()
assert retrieved == payload

View File

@@ -54,7 +54,7 @@ def test_password_change_and_unlock(monkeypatch):
pm.fingerprint_dir = fp
pm.current_fingerprint = "fp"
pm.parent_seed = SEED
pm.nostr_client = SimpleNamespace(publish_json_to_nostr=lambda *a, **k: None)
pm.nostr_client = SimpleNamespace(publish_snapshot=lambda *a, **k: None)
monkeypatch.setattr(
"password_manager.manager.prompt_existing_password", lambda *_: old_pw
@@ -64,9 +64,7 @@ def test_password_change_and_unlock(monkeypatch):
)
monkeypatch.setattr(
"password_manager.manager.NostrClient",
lambda *a, **kw: SimpleNamespace(
publish_json_to_nostr=lambda *a, **k: None
),
lambda *a, **kw: SimpleNamespace(publish_snapshot=lambda *a, **k: None),
)
pm.change_password()

View File

@@ -60,9 +60,7 @@ def test_add_and_delete_entry(monkeypatch):
published = []
pm.nostr_client = SimpleNamespace(
publish_json_to_nostr=lambda data, alt_summary=None: (
published.append(data) or True
)
publish_snapshot=lambda data, alt_summary=None: published.append(data)
)
inputs = iter([str(index)])

View File

@@ -2,12 +2,14 @@ import sys
from pathlib import Path
from tempfile import TemporaryDirectory
from unittest.mock import patch
import asyncio
import pytest
from cryptography.fernet import Fernet
sys.path.append(str(Path(__file__).resolve().parents[1]))
from password_manager.encryption import EncryptionManager
from nostr.client import NostrClient
from nostr.client import NostrClient, Manifest
def setup_client(tmp_path):
@@ -27,21 +29,34 @@ def setup_client(tmp_path):
class FakeEvent:
def __init__(self):
def __init__(self, content="evt"):
self._id = "id"
self._content = content
def id(self):
return self._id
def content(self):
return self._content
class FakeUnsignedEvent:
def __init__(self, content="evt"):
self._content = content
def sign_with_keys(self, _):
return FakeEvent()
return FakeEvent(self._content)
class FakeBuilder:
def __init__(self, _kind=None, content="evt"):
self._content = content
def tags(self, _tags):
return self
def build(self, _):
return FakeUnsignedEvent()
return FakeUnsignedEvent(self._content)
class FakeEventId:
@@ -54,22 +69,32 @@ class FakeSendEventOutput:
self.id = FakeEventId()
def test_publish_json_success():
def test_publish_snapshot_success():
with TemporaryDirectory() as tmpdir, patch(
"nostr.client.EventBuilder.text_note", return_value=FakeBuilder()
"nostr.client.EventBuilder", FakeBuilder
):
client = setup_client(Path(tmpdir))
async def fake_send(event):
return FakeSendEventOutput()
with patch.object(
client, "publish_event", return_value=FakeSendEventOutput()
) as mock_pub:
assert client.publish_json_to_nostr(b"data") is True
mock_pub.assert_called()
client.client, "send_event", side_effect=fake_send
) as mock_send:
manifest = asyncio.run(client.publish_snapshot(b"data"))
assert isinstance(manifest, Manifest)
assert mock_send.await_count >= 1
def test_publish_json_failure():
def test_publish_snapshot_failure():
with TemporaryDirectory() as tmpdir, patch(
"nostr.client.EventBuilder.text_note", return_value=FakeBuilder()
"nostr.client.EventBuilder", FakeBuilder
):
client = setup_client(Path(tmpdir))
with patch.object(client, "publish_event", side_effect=Exception("boom")):
assert client.publish_json_to_nostr(b"data") is False
async def boom(_):
raise Exception("boom")
with patch.object(client.client, "send_event", side_effect=boom):
with pytest.raises(Exception):
asyncio.run(client.publish_snapshot(b"data"))

View File

@@ -33,7 +33,7 @@ def setup_pm(tmp_path, monkeypatch):
relays=list(DEFAULT_RELAYS),
close_client_pool=lambda: None,
initialize_client_pool=lambda: None,
publish_json_to_nostr=lambda data, alt_summary=None: None,
publish_snapshot=lambda data, alt_summary=None: None,
key_manager=SimpleNamespace(get_npub=lambda: "npub"),
)