From c0c00259c974230640fa5e8ede04d879702d6449 Mon Sep 17 00:00:00 2001 From: Martin McGrane Date: Tue, 22 Aug 2023 12:40:56 +1000 Subject: [PATCH] Add standard defaults for db/eng name --- src/code-util.jl | 2 ++ src/testpool.jl | 3 ++- src/testrel.jl | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/code-util.jl b/src/code-util.jl index 6a2c826..b84d76c 100644 --- a/src/code-util.jl +++ b/src/code-util.jl @@ -348,3 +348,5 @@ end default_timeout() = parse(Int64, get(ENV, "TEST_REL_TEST_TIMEOUT", "300")) default_allowed() = Symbol(get(ENV, "TEST_REL_ALLOWED", ":warning")) +default_db_name() = get(ENV, "TEST_REL_DB_NAME", "test_rel") +default_engine_name() = get(ENV, "TEST_REL_ENGINE_NAME", "test_rel") diff --git a/src/testpool.jl b/src/testpool.jl index cf21b93..24575da 100644 --- a/src/testpool.jl +++ b/src/testpool.jl @@ -132,7 +132,8 @@ function delete_test_engine!(name::String) end function get_next_engine_name(id::Int64) - return "julia-sdk-test-$(id)" + base_name = default_engine_name() + return "$(base_name)-$(id)" end """ diff --git a/src/testrel.jl b/src/testrel.jl index cbe9711..bf6519e 100644 --- a/src/testrel.jl +++ b/src/testrel.jl @@ -39,8 +39,8 @@ function set_context!(new_context::Context) return TEST_CONTEXT[] = new_context end -function create_test_database_name(; default_basename="test_rel")::String - basename = get(ENV, "TEST_REL_DB_BASENAME", default_basename) +function create_test_database_name()::String + basename = default_db_name() return gen_safe_name(basename) end