fix(tests): should really centralize these database URLs at some point
This commit is contained in:
parent
80c4aec5e6
commit
15ffac64fb
|
|
@ -12,7 +12,7 @@ on:
|
||||||
|
|
||||||
env:
|
env:
|
||||||
CARGO_TERM_COLOR: always
|
CARGO_TERM_COLOR: always
|
||||||
DATABASE_URL: postgresql://postgres:postgres@localhost:5432/readur_test
|
DATABASE_URL: postgresql://readur:readur@localhost:5432/readur
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
integration-tests:
|
integration-tests:
|
||||||
|
|
|
||||||
|
|
@ -70,7 +70,7 @@ async fn create_test_app_state() -> Result<Arc<AppState>> {
|
||||||
// Create a test config if env fails - use DATABASE_URL env var or fallback
|
// Create a test config if env fails - use DATABASE_URL env var or fallback
|
||||||
let database_url = std::env::var("DATABASE_URL")
|
let database_url = std::env::var("DATABASE_URL")
|
||||||
.or_else(|_| std::env::var("TEST_DATABASE_URL"))
|
.or_else(|_| std::env::var("TEST_DATABASE_URL"))
|
||||||
.unwrap_or_else(|_| "postgresql://postgres:postgres@localhost:5432/readur_test".to_string());
|
.unwrap_or_else(|_| "postgresql://readur:readur@localhost:5432/readur".to_string());
|
||||||
Config {
|
Config {
|
||||||
database_url,
|
database_url,
|
||||||
server_address: "127.0.0.1:8000".to_string(),
|
server_address: "127.0.0.1:8000".to_string(),
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ async fn create_test_app_state() -> Result<Arc<AppState>> {
|
||||||
let config = Config::from_env().unwrap_or_else(|_| {
|
let config = Config::from_env().unwrap_or_else(|_| {
|
||||||
let database_url = std::env::var("DATABASE_URL")
|
let database_url = std::env::var("DATABASE_URL")
|
||||||
.or_else(|_| std::env::var("TEST_DATABASE_URL"))
|
.or_else(|_| std::env::var("TEST_DATABASE_URL"))
|
||||||
.unwrap_or_else(|_| "postgresql://postgres:postgres@localhost:5432/readur_test".to_string());
|
.unwrap_or_else(|_| "postgresql://readur:readur@localhost:5432/readur".to_string());
|
||||||
|
|
||||||
Config {
|
Config {
|
||||||
database_url,
|
database_url,
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,7 @@ impl OCRPipelineTestHarness {
|
||||||
async fn new() -> Result<Self> {
|
async fn new() -> Result<Self> {
|
||||||
let database_url = std::env::var("TEST_DATABASE_URL")
|
let database_url = std::env::var("TEST_DATABASE_URL")
|
||||||
.or_else(|_| std::env::var("DATABASE_URL"))
|
.or_else(|_| std::env::var("DATABASE_URL"))
|
||||||
.unwrap_or_else(|_| "postgresql://postgres:postgres@localhost:5432/readur_test".to_string());
|
.unwrap_or_else(|_| "postgresql://readur:readur@localhost:5432/readur".to_string());
|
||||||
|
|
||||||
// Initialize database connection with higher limits for stress testing
|
// Initialize database connection with higher limits for stress testing
|
||||||
let pool = sqlx::postgres::PgPoolOptions::new()
|
let pool = sqlx::postgres::PgPoolOptions::new()
|
||||||
|
|
|
||||||
|
|
@ -116,7 +116,7 @@ async fn create_test_app_state() -> Result<Arc<AppState>> {
|
||||||
let config = Config::from_env().unwrap_or_else(|_| {
|
let config = Config::from_env().unwrap_or_else(|_| {
|
||||||
let database_url = std::env::var("DATABASE_URL")
|
let database_url = std::env::var("DATABASE_URL")
|
||||||
.or_else(|_| std::env::var("TEST_DATABASE_URL"))
|
.or_else(|_| std::env::var("TEST_DATABASE_URL"))
|
||||||
.unwrap_or_else(|_| "postgresql://postgres:postgres@localhost:5432/readur_test".to_string());
|
.unwrap_or_else(|_| "postgresql://readur:readur@localhost:5432/readur".to_string());
|
||||||
Config {
|
Config {
|
||||||
database_url,
|
database_url,
|
||||||
server_address: "127.0.0.1:8000".to_string(),
|
server_address: "127.0.0.1:8000".to_string(),
|
||||||
|
|
|
||||||
|
|
@ -116,7 +116,7 @@ async fn create_test_app_state() -> Result<Arc<AppState>> {
|
||||||
let config = Config::from_env().unwrap_or_else(|_| {
|
let config = Config::from_env().unwrap_or_else(|_| {
|
||||||
let database_url = std::env::var("DATABASE_URL")
|
let database_url = std::env::var("DATABASE_URL")
|
||||||
.or_else(|_| std::env::var("TEST_DATABASE_URL"))
|
.or_else(|_| std::env::var("TEST_DATABASE_URL"))
|
||||||
.unwrap_or_else(|_| "postgresql://postgres:postgres@localhost:5432/readur_test".to_string());
|
.unwrap_or_else(|_| "postgresql://readur:readur@localhost:5432/readur".to_string());
|
||||||
Config {
|
Config {
|
||||||
database_url,
|
database_url,
|
||||||
server_address: "127.0.0.1:8000".to_string(),
|
server_address: "127.0.0.1:8000".to_string(),
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue