laantungir/ngit-grasp
1
0
Fork 0
mirror of https://relay.ngit.dev/npub15qydau2hjma6ngxkl2cyar74wzyjshvl65za5k5rl69264ar2exs5cyejr/ngit-grasp.git synced 2026-10-05 15:08:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: add purgatory to PR push test

Browse Source 
commented out so it currently passes
This commit is contained in:
DanConwayDev
2025-12-23 16:20:24 +00:00
parent 2f4da43c5b
commit f8c3e3920e
2 changed files with 41 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
grasp-audit/src/specs/grasp01/push_authorization.rs
+38 -3
View File
@@ -39,6 +39,7 @@ use nostr_sdk::prelude::*;
use std::fs;
use std::path::{Path, PathBuf};
use std::process::Command;
use std::time::Duration;
// ============================================================
// PR Event Test Helper Functions
@@ -382,7 +383,7 @@ impl PushAuthorizationTests {
.await,
);
results.add(
Self::test_push_to_nostr_ref_with_correct_commit_after_event_received_accepted(
Self::test_push_to_nostr_ref_with_correct_commit_after_event_received_accepted_and_event_served(
client,
relay_domain,
)
@@ -1289,10 +1290,10 @@ impl PushAuthorizationTests {
///
/// This test verifies that the relay accepts pushes to refs/nostr/<event-id>
/// when a corresponding event exists AND the pushed commit matches
/// the commit in the PR event's `c` tag.
/// the commit in the PR event's `c` tag AND the PR event is served on relay.
///
/// Uses `PREventSentAfterWrongPush` fixture, then creates correct commit and pushes.
pub async fn test_push_to_nostr_ref_with_correct_commit_after_event_received_accepted(
pub async fn test_push_to_nostr_ref_with_correct_commit_after_event_received_accepted_and_event_served(
client: &AuditClient,
relay_domain: &str,
) -> TestResult {
@@ -1353,6 +1354,21 @@ impl PushAuthorizationTests {
return TestResult::new(test_name, "GRASP-01:git-http:40", desc).fail(&e);
}
// TODO - uncomment this when purgatory feature added
// // Check event is not yet served by relay (still in purgatory)
// match client.is_event_on_relay(pr_event.id).await {
// Ok(on_relay) => {
// if !on_relay {
// return TestResult::new(test_name, "GRASP-01:git-http:40", desc)
// .fail("PR event not in purgatory before correct commit pushed to refs/nostr/<event-id> (the relay serve the PR event)");
// }
// }
// Err(_) => {
// return TestResult::new(test_name, "GRASP-01:git-http:40", desc)
// .fail("failed to query relay");
// }
// }
// Push correct commit (should succeed)
let push_succeeded = match push_to_pr_ref(&clone_path, &pr_event_id) {
Ok(success) => success,
@@ -1370,6 +1386,25 @@ impl PushAuthorizationTests {
.fail("Push rejected (expected acceptance since commit matches PR event)");
}
// ============================================================
// Stage 5: Verify PR event is on relay
// ============================================================
tokio::time::sleep(Duration::from_millis(200)).await;
match client.is_event_on_relay(pr_event.id).await {
Ok(on_relay) => {
if !on_relay {
return TestResult::new(test_name, "GRASP-01:git-http:40", desc)
.fail("PR event not served after correct commit at refs/nostr/<event-id>");
}
}
Err(_) => {
return TestResult::new(test_name, "GRASP-01:git-http:40", desc)
.fail("failed to query relay");
}
}
TestResult::new(test_name, "GRASP-01:git-http:40", desc).pass()
}
tests/push_authorization.rs
+3 -2
View File
@@ -67,11 +67,12 @@ isolated_push_test!(test_push_to_nostr_ref_with_invalid_event_id_rejected);
isolated_push_test!(test_pr_push_to_nostr_ref_with_wrong_commit_accepted_before_event_received);
isolated_push_test!(test_pr_event_published_removes_nostr_ref_at_incorrect_commit);
isolated_push_test!(test_push_to_nostr_ref_with_wrong_commit_after_event_received_rejected);
isolated_push_test!(test_push_to_nostr_ref_with_correct_commit_after_event_received_accepted);
isolated_push_test!(
test_push_to_nostr_ref_with_correct_commit_after_event_received_accepted_and_event_served
);
isolated_push_test!(test_head_set_after_state_event_with_existing_commit);
isolated_push_test!(test_head_set_after_git_push_with_required_oids);
// Note: test_push_of_state_by_maintainer_updates_other_maintainer_repos is not included
// as it's a stub for the purgatory feature. It can be run manually once implemented:
// isolated_push_test!(test_push_of_state_by_maintainer_updates_other_maintainer_repos);