Running the E2E suites against real Postgres surfaced three shape bugs
in the test scripts that caused false failures:
invoke_e2e:
- invoke_cross_app_rejects used two TestServer instances (one per app),
but the second server's Owner admin isn't a member of the first
server's app. Replaced with a single server that creates both apps
via the same Owner admin (which has implicit access to every app).
- invoke_depth_limit_exceeds_cleanly: the recurser script had its own
try/catch, so when the depth limit fired inside the deepest call the
caught error became the BODY of a 200 response (which invoke()
returns to the caller). The outer caller's try/catch never saw a
throw → assertion failed. Rewrote so the recurser propagates throws
(no inner try-catch); the outer caller's try-catch surfaces the
depth error all the way up.
retry_e2e:
- All three tests used HTTP routes which need a domain claim the test
apps don't have (`no app claims host ""` 404s). Switched to the
admin bypass POST /api/v1/execute/{id} — same pattern dispatcher_e2e
uses. Sidesteps the per-app domain matcher entirely.
- retry_run_surfaces_last_error_after_max_attempts: try-catch is a
statement in Rhai, not an expression, so the block didn't evaluate
to the catch arm's map. Refactored to bind to `let out` inside the
catch arm, then return `#{ statusCode: 200, body: out }` as the
final expression.
All 11 v1.1.9 E2E tests now pass against Postgres:
queue_e2e: 4 passed (33s — exercises retry + dead-letter)
invoke_e2e: 4 passed (2s)
retry_e2e: 3 passed (2.5s)
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
161 lines
5.4 KiB
Rust
161 lines
5.4 KiB
Rust
//! v1.1.9 retry::* end-to-end test against a real engine inside the
|
|
//! all-in-one binary. Smaller surface than queue/invoke (no async
|
|
//! plumbing) — covers policy clamping, success-on-Nth-attempt, and
|
|
//! on_codes filtering through the admin bypass POST /api/v1/execute/{id}
|
|
//! (sidesteps the per-app domain matcher).
|
|
//!
|
|
//! Skips when DATABASE_URL is unset.
|
|
|
|
#![allow(clippy::needless_pass_by_value)]
|
|
|
|
use axum_test::TestServer;
|
|
use serde_json::{json, Value};
|
|
use sqlx::postgres::PgPoolOptions;
|
|
use sqlx::PgPool;
|
|
use uuid::Uuid;
|
|
|
|
async fn pool_or_skip() -> Option<PgPool> {
|
|
let Ok(url) = std::env::var("DATABASE_URL") else {
|
|
eprintln!("retry_e2e: DATABASE_URL unset — skipping");
|
|
return None;
|
|
};
|
|
let pool = PgPoolOptions::new()
|
|
.max_connections(2)
|
|
.connect(&url)
|
|
.await
|
|
.expect("connect");
|
|
sqlx::migrate!("../manager-core/migrations")
|
|
.run(&pool)
|
|
.await
|
|
.expect("migrate");
|
|
Some(pool)
|
|
}
|
|
|
|
async fn server_for(pool: PgPool, suffix: &str) -> (TestServer, String) {
|
|
use picloud_manager_core::auth::hash_password;
|
|
use picloud_shared::InstanceRole;
|
|
|
|
let unique = format!("{suffix}-{}", Uuid::new_v4().simple());
|
|
let auth = picloud::AuthDeps::from_pool(pool.clone());
|
|
let username = format!("e2e-{unique}");
|
|
let hash = hash_password("pw").expect("hash");
|
|
auth.users
|
|
.create(&username, &hash, InstanceRole::Owner, None)
|
|
.await
|
|
.expect("seed admin");
|
|
|
|
let app = picloud::build_app(
|
|
pool,
|
|
auth,
|
|
picloud_shared::MasterKey::from_bytes([0x42u8; 32]),
|
|
)
|
|
.await
|
|
.expect("build_app");
|
|
let mut server = TestServer::new(app).expect("TestServer");
|
|
let resp = server
|
|
.post("/api/v1/admin/auth/login")
|
|
.json(&json!({ "username": username, "password": "pw" }))
|
|
.await;
|
|
resp.assert_status_ok();
|
|
let token = resp.json::<Value>()["token"]
|
|
.as_str()
|
|
.expect("token")
|
|
.to_string();
|
|
server.add_header("authorization", format!("Bearer {token}"));
|
|
|
|
let slug = format!("e2e-{unique}");
|
|
let created: Value = server
|
|
.post("/api/v1/admin/apps")
|
|
.json(&json!({ "slug": slug, "name": slug }))
|
|
.await
|
|
.json();
|
|
let app_id = created["id"].as_str().expect("app id").to_string();
|
|
(server, app_id)
|
|
}
|
|
|
|
async fn create_script(server: &TestServer, app_id: &str, name: &str, source: &str) -> String {
|
|
let created: Value = server
|
|
.post("/api/v1/admin/scripts")
|
|
.json(&json!({ "app_id": app_id, "name": name, "source": source }))
|
|
.await
|
|
.json();
|
|
created["id"].as_str().expect("script id").to_string()
|
|
}
|
|
|
|
/// Execute via the admin bypass (same pattern as dispatcher_e2e).
|
|
async fn execute(server: &TestServer, script_id: &str) -> Value {
|
|
server
|
|
.post(&format!("/api/v1/execute/{script_id}"))
|
|
.json(&json!({}))
|
|
.await
|
|
.json()
|
|
}
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn retry_run_eventually_succeeds_inside_http_handler() {
|
|
let Some(pool) = pool_or_skip().await else { return };
|
|
let (server, app_id) = server_for(pool, "retry-succ").await;
|
|
|
|
// attempt counter mutates across retries; the 3rd attempt returns
|
|
// the count.
|
|
let src = r#"
|
|
let attempts = 0;
|
|
let p = retry::policy(#{ max_attempts: 5, base_ms: 1, jitter_pct: 0 });
|
|
let v = retry::run(p, || {
|
|
attempts += 1;
|
|
if attempts < 3 { throw "transient" } else { attempts }
|
|
});
|
|
#{ statusCode: 200, body: v }
|
|
"#;
|
|
let script_id = create_script(&server, &app_id, "succ", src).await;
|
|
let body = execute(&server, &script_id).await;
|
|
assert_eq!(body, json!(3));
|
|
}
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn retry_run_surfaces_last_error_after_max_attempts() {
|
|
let Some(pool) = pool_or_skip().await else { return };
|
|
let (server, app_id) = server_for(pool, "retry-surf").await;
|
|
|
|
let src = r#"
|
|
let p = retry::policy(#{ max_attempts: 2, base_ms: 1, jitter_pct: 0 });
|
|
let out = "did not throw";
|
|
try {
|
|
retry::run(p, || { throw "boom" });
|
|
} catch(e) {
|
|
out = e;
|
|
}
|
|
#{ statusCode: 200, body: out }
|
|
"#;
|
|
let script_id = create_script(&server, &app_id, "surf", src).await;
|
|
let body = execute(&server, &script_id).await;
|
|
let s = body.as_str().unwrap_or_default();
|
|
assert!(s.contains("boom"), "expected 'boom' in error, got: {s}");
|
|
}
|
|
|
|
#[tokio::test(flavor = "multi_thread", worker_threads = 2)]
|
|
async fn retry_on_codes_filters_unmatched_errors() {
|
|
let Some(pool) = pool_or_skip().await else { return };
|
|
let (server, app_id) = server_for(pool, "retry-codes").await;
|
|
|
|
// attempts is mutated on every entry; we throw a non-matching code
|
|
// → must surface immediately (attempts == 1).
|
|
let src = r#"
|
|
let attempts = 0;
|
|
let p = retry::policy(#{ max_attempts: 5, base_ms: 1, jitter_pct: 0 });
|
|
let p2 = retry::on_codes(p, ["http: 503"]);
|
|
try {
|
|
retry::run(p2, || {
|
|
attempts += 1;
|
|
throw "other failure"
|
|
});
|
|
} catch(_e) {
|
|
// swallow — assert via attempts count.
|
|
}
|
|
#{ statusCode: 200, body: attempts }
|
|
"#;
|
|
let script_id = create_script(&server, &app_id, "codes", src).await;
|
|
let body = execute(&server, &script_id).await;
|
|
assert_eq!(body, json!(1), "non-matching error should surface immediately");
|
|
}
|