kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-06 02:15:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13485 from hashicorp/f-api-env-cleanup

Browse Source 
api: use testing.T.Setenv to set env vars in tests
This commit is contained in:
Seth Hoenig
2022-06-27 12:16:09 -05:00
committed by GitHub
parent ce2104b635 0975abd5ee
commit ffba8679ed
2 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/api.go
View File

@@ -18,8 +18,8 @@ import (
"time"
"github.com/gorilla/websocket"
cleanhttp "github.com/hashicorp/go-cleanhttp"
rootcerts "github.com/hashicorp/go-rootcerts"
"github.com/hashicorp/go-cleanhttp"
"github.com/hashicorp/go-rootcerts"
)
var (

26
api/api_test.go
View File

@@ -11,7 +11,6 @@ import (
"net/http"
"net/http/httptest"
"net/url"
"os"
"strings"
"testing"
"time"
@@ -119,31 +118,22 @@ func TestRequestTime(t *testing.T) {
func TestDefaultConfig_env(t *testing.T) {
testutil.Parallel(t)
url := "http://1.2.3.4:5678"
testURL := "http://1.2.3.4:5678"
auth := []string{"nomaduser", "12345"}
region := "test"
namespace := "dev"
token := "foobar"
os.Setenv("NOMAD_ADDR", url)
defer os.Setenv("NOMAD_ADDR", "")
os.Setenv("NOMAD_REGION", region)
defer os.Setenv("NOMAD_REGION", "")
os.Setenv("NOMAD_NAMESPACE", namespace)
defer os.Setenv("NOMAD_NAMESPACE", "")
os.Setenv("NOMAD_HTTP_AUTH", strings.Join(auth, ":"))
defer os.Setenv("NOMAD_HTTP_AUTH", "")
os.Setenv("NOMAD_TOKEN", token)
defer os.Setenv("NOMAD_TOKEN", "")
t.Setenv("NOMAD_ADDR", testURL)
t.Setenv("NOMAD_REGION", region)
t.Setenv("NOMAD_NAMESPACE", namespace)
t.Setenv("NOMAD_HTTP_AUTH", strings.Join(auth, ":"))
t.Setenv("NOMAD_TOKEN", token)
config := DefaultConfig()
if config.Address != url {
t.Errorf("expected %q to be %q", config.Address, url)
if config.Address != testURL {
t.Errorf("expected %q to be %q", config.Address, testURL)
}
if config.Region != region {