Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions bin/ca-server/tests/audit_cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@ async fn the_audit_command_reports_what_the_journal_cannot_vouch_for() {
.duration_since(std::time::UNIX_EPOCH)
.unwrap()
.as_nanos();
let name = format!("audcli_{nanos}");
let name = format!("audcli_{nanos}_{}_{}", std::process::id(), {
static SEQ: std::sync::atomic::AtomicU32 = std::sync::atomic::AtomicU32::new(0);
SEQ.fetch_add(1, std::sync::atomic::Ordering::Relaxed)
});
let admin = PgPoolOptions::new().connect(&base).await.unwrap();
sqlx::query(&format!("CREATE DATABASE {name}"))
.execute(&admin)
Expand Down Expand Up @@ -88,7 +91,10 @@ async fn the_audit_command_does_not_require_hsm_configuration() {
.duration_since(std::time::UNIX_EPOCH)
.unwrap()
.as_nanos();
let name = format!("audnohsm_{nanos}");
let name = format!("audnohsm_{nanos}_{}_{}", std::process::id(), {
static SEQ: std::sync::atomic::AtomicU32 = std::sync::atomic::AtomicU32::new(0);
SEQ.fetch_add(1, std::sync::atomic::Ordering::Relaxed)
});
let admin = PgPoolOptions::new().connect(&base).await.unwrap();
sqlx::query(&format!("CREATE DATABASE {name}"))
.execute(&admin)
Expand Down
5 changes: 4 additions & 1 deletion bin/ca-server/tests/bootstrap_cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ async fn standard_output_carries_only_the_token() {
.duration_since(std::time::UNIX_EPOCH)
.unwrap()
.as_nanos();
let name = format!("cli_{nanos}");
let name = format!("cli_{nanos}_{}_{}", std::process::id(), {
static SEQ: std::sync::atomic::AtomicU32 = std::sync::atomic::AtomicU32::new(0);
SEQ.fetch_add(1, std::sync::atomic::Ordering::Relaxed)
});
let admin = PgPoolOptions::new().connect(&base).await.unwrap();
sqlx::query(&format!("CREATE DATABASE {name}"))
.execute(&admin)
Expand Down
5 changes: 4 additions & 1 deletion bin/ca-server/tests/internal_link.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@ fn unique(prefix: &str) -> String {
.duration_since(std::time::UNIX_EPOCH)
.unwrap()
.as_nanos();
format!("{prefix}-{nanos}")
format!("{prefix}-{nanos}_{}_{}", std::process::id(), {
static SEQ: std::sync::atomic::AtomicU32 = std::sync::atomic::AtomicU32::new(0);
SEQ.fetch_add(1, std::sync::atomic::Ordering::Relaxed)
})
}

async fn call(
Expand Down
10 changes: 8 additions & 2 deletions bin/ca-server/tests/reconcile_cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ async fn fixture(prefix: &str) -> Option<Fixture> {
.duration_since(std::time::UNIX_EPOCH)
.unwrap()
.as_nanos();
let name = format!("{prefix}_{nanos}");
let name = format!("{prefix}_{nanos}_{}_{}", std::process::id(), {
static SEQ: std::sync::atomic::AtomicU32 = std::sync::atomic::AtomicU32::new(0);
SEQ.fetch_add(1, std::sync::atomic::Ordering::Relaxed)
});
let admin = PgPoolOptions::new().connect(&base).await.unwrap();
sqlx::query(&format!("CREATE DATABASE {name}"))
.execute(&admin)
Expand Down Expand Up @@ -262,7 +265,10 @@ async fn the_reconcile_command_does_not_require_hsm_configuration() {
.duration_since(std::time::UNIX_EPOCH)
.unwrap()
.as_nanos();
let name = format!("reconohsm_{nanos}");
let name = format!("reconohsm_{nanos}_{}_{}", std::process::id(), {
static SEQ: std::sync::atomic::AtomicU32 = std::sync::atomic::AtomicU32::new(0);
SEQ.fetch_add(1, std::sync::atomic::Ordering::Relaxed)
});
let admin = PgPoolOptions::new().connect(&base).await.unwrap();
sqlx::query(&format!("CREATE DATABASE {name}"))
.execute(&admin)
Expand Down
5 changes: 4 additions & 1 deletion bin/ca-server/tests/recover_cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,10 @@ async fn the_token_pin_from_stdin_is_the_proof_of_custody() {
.duration_since(std::time::UNIX_EPOCH)
.unwrap()
.as_nanos();
let name = format!("recli_{nanos}");
let name = format!("recli_{nanos}_{}_{}", std::process::id(), {
static SEQ: std::sync::atomic::AtomicU32 = std::sync::atomic::AtomicU32::new(0);
SEQ.fetch_add(1, std::sync::atomic::Ordering::Relaxed)
});
let dir = std::env::temp_dir().join(&name);
std::fs::create_dir_all(dir.join("tokens")).unwrap();
std::fs::write(
Expand Down
5 changes: 4 additions & 1 deletion bin/ca-server/tests/revocation_action.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,10 @@ impl Env {
.duration_since(std::time::UNIX_EPOCH)
.unwrap()
.as_nanos();
let name = format!("rev_{nanos}");
let name = format!("rev_{nanos}_{}_{}", std::process::id(), {
static SEQ: std::sync::atomic::AtomicU32 = std::sync::atomic::AtomicU32::new(0);
SEQ.fetch_add(1, std::sync::atomic::Ordering::Relaxed)
});
let admin = PgPoolOptions::new().connect(&base).await.unwrap();
sqlx::query(&format!("CREATE DATABASE {name}"))
.execute(&admin)
Expand Down
5 changes: 4 additions & 1 deletion bin/ca-server/tests/s3_journal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,10 @@ async fn fixture(prefix: &str) -> Option<Fixture> {
.duration_since(std::time::UNIX_EPOCH)
.unwrap()
.as_nanos();
let name = format!("{prefix}_{nanos}");
let name = format!("{prefix}_{nanos}_{}_{}", std::process::id(), {
static SEQ: std::sync::atomic::AtomicU32 = std::sync::atomic::AtomicU32::new(0);
SEQ.fetch_add(1, std::sync::atomic::Ordering::Relaxed)
});
let admin = PgPoolOptions::new().connect(&base).await.unwrap();
sqlx::query(&format!("CREATE DATABASE {name}"))
.execute(&admin)
Expand Down
5 changes: 4 additions & 1 deletion bin/ra-console/tests/db_guard.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@ async fn fresh() -> Option<(PgPool, String)> {
.duration_since(std::time::UNIX_EPOCH)
.unwrap()
.as_nanos();
let name = format!("dbg_{nanos}");
let name = format!("dbg_{nanos}_{}_{}", std::process::id(), {
static SEQ: std::sync::atomic::AtomicU32 = std::sync::atomic::AtomicU32::new(0);
SEQ.fetch_add(1, std::sync::atomic::Ordering::Relaxed)
});
let admin = PgPoolOptions::new().connect(&base).await.unwrap();
sqlx::query(&format!("CREATE DATABASE {name}"))
.execute(&admin)
Expand Down
5 changes: 4 additions & 1 deletion bin/ra-console/tests/login.rs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,10 @@ impl Env {
.duration_since(std::time::UNIX_EPOCH)
.unwrap()
.as_nanos();
let name = format!("login_{nanos}");
let name = format!("login_{nanos}_{}_{}", std::process::id(), {
static SEQ: std::sync::atomic::AtomicU32 = std::sync::atomic::AtomicU32::new(0);
SEQ.fetch_add(1, std::sync::atomic::Ordering::Relaxed)
});
let admin = PgPoolOptions::new().connect(&base).await.unwrap();
sqlx::query(&format!("CREATE DATABASE {name}"))
.execute(&admin)
Expand Down
5 changes: 4 additions & 1 deletion bin/ra-console/tests/purge.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@ async fn fixture(prefix: &str) -> Option<(sqlx::PgPool, oe_webauthn::Uuid, Strin
.duration_since(std::time::UNIX_EPOCH)
.unwrap()
.as_nanos();
let name = format!("{prefix}_{nanos}");
let name = format!("{prefix}_{nanos}_{}_{}", std::process::id(), {
static SEQ: std::sync::atomic::AtomicU32 = std::sync::atomic::AtomicU32::new(0);
SEQ.fetch_add(1, std::sync::atomic::Ordering::Relaxed)
});
let admin = PgPoolOptions::new().connect(&base).await.unwrap();
sqlx::query(&format!("CREATE DATABASE {name}"))
.execute(&admin)
Expand Down
5 changes: 4 additions & 1 deletion bin/ra-console/tests/register_relay.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,10 @@ impl Env {
.duration_since(std::time::UNIX_EPOCH)
.unwrap()
.as_nanos();
let name = format!("rel_{nanos}");
let name = format!("rel_{nanos}_{}_{}", std::process::id(), {
static SEQ: std::sync::atomic::AtomicU32 = std::sync::atomic::AtomicU32::new(0);
SEQ.fetch_add(1, std::sync::atomic::Ordering::Relaxed)
});
let admin = PgPoolOptions::new().connect(&base).await.unwrap();
sqlx::query(&format!("CREATE DATABASE {name}"))
.execute(&admin)
Expand Down
5 changes: 4 additions & 1 deletion bin/ra-console/tests/requests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,10 @@ impl Env {
.duration_since(std::time::UNIX_EPOCH)
.unwrap()
.as_nanos();
let name = format!("requests_{nanos}");
let name = format!("requests_{nanos}_{}_{}", std::process::id(), {
static SEQ: std::sync::atomic::AtomicU32 = std::sync::atomic::AtomicU32::new(0);
SEQ.fetch_add(1, std::sync::atomic::Ordering::Relaxed)
});
let admin = PgPoolOptions::new().connect(&base).await.unwrap();
sqlx::query(&format!("CREATE DATABASE {name}"))
.execute(&admin)
Expand Down
Loading