From 18cbade269362a3fed5763e2b1b39be33ba56aaf Mon Sep 17 00:00:00 2001 From: Eugene Triguba Date: Sat, 9 Mar 2024 12:07:30 -0500 Subject: Fix tests to work without Dockerfile.test --- internal/bolttest/db.go | 10 +++++----- internal/bolttest/env.go | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 internal/bolttest/env.go (limited to 'internal/bolttest') diff --git a/internal/bolttest/db.go b/internal/bolttest/db.go index bde519b..6ebbabf 100644 --- a/internal/bolttest/db.go +++ b/internal/bolttest/db.go @@ -12,16 +12,16 @@ import ( ) func NewTestConnectionConfig(t *testing.T, driver string) *configloader.ConnectionConfig { - port, err := strconv.Atoi(os.Getenv("DB_PORT")) + port, err := strconv.Atoi(os.Getenv("BOLT_DB_CONN_PORT")) assert.Nil(t, err) return &configloader.ConnectionConfig{ Driver: driver, - DBName: os.Getenv("DB_NAME"), - Host: os.Getenv("DB_HOST"), + DBName: os.Getenv("BOLT_DB_CONN_DBNAME"), + Host: os.Getenv("BOLT_DB_CONN_HOST"), Port: port, - User: os.Getenv("DB_USERNAME"), - Password: os.Getenv("DB_PASSWORD"), + User: os.Getenv("BOLT_DB_CONN_USER"), + Password: os.Getenv("BOLT_DB_CONN_PASSWORD"), } } diff --git a/internal/bolttest/env.go b/internal/bolttest/env.go new file mode 100644 index 0000000..8f0ad63 --- /dev/null +++ b/internal/bolttest/env.go @@ -0,0 +1,19 @@ +package bolttest + +import ( + "os" + "testing" + + "github.com/eugenetriguba/checkmate/assert" +) + +func UnsetEnv(t *testing.T, key string) { + originalVal, isSet := os.LookupEnv(key) + if isSet { + t.Cleanup(func() { + err := os.Setenv(key, originalVal) + assert.Nil(t, err) + }) + os.Unsetenv(key) + } +} -- cgit v1.2.3