luxolus/open-nomad
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

testing: in MkAllocDir, do not update TaskConfig with All() from the task builder, just with Env() (because it pollutes environment variables with node attributes and fails the rkt tests)

Browse source
This commit is contained in:
Chris Baker 2018-11-28 22:19:48 +00:00
parent 67d16d22b1
commit da35fda145
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/drivers/testing.go
View file

@ -117,9 +117,9 @@ func (h *DriverHarness) MkAllocDir(t *TaskConfig, enableLogs bool) func() {
taskEnv := taskBuilder.Build() taskEnv := taskBuilder.Build()
if t.Env == nil { if t.Env == nil {
t.Env = taskEnv.All() t.Env = taskEnv.Map()
} else { } else {
for k, v := range taskEnv.All() { for k, v := range taskEnv.Map() {
if _, ok := t.Env[k]; !ok { if _, ok := t.Env[k]; !ok {
t.Env[k] = v t.Env[k] = v
} }