From 72ca56dabe54dcdd3224a9ce6cd15482b9bdb2e8 Mon Sep 17 00:00:00 2001 From: Chris Baker Date: Wed, 28 Nov 2018 22:19:48 +0000 Subject: [PATCH] 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) --- plugins/drivers/testing.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/drivers/testing.go b/plugins/drivers/testing.go index 5281349fd..f205aae85 100644 --- a/plugins/drivers/testing.go +++ b/plugins/drivers/testing.go @@ -117,9 +117,9 @@ func (h *DriverHarness) MkAllocDir(t *TaskConfig, enableLogs bool) func() { taskEnv := taskBuilder.Build() if t.Env == nil { - t.Env = taskEnv.All() + t.Env = taskEnv.Map() } else { - for k, v := range taskEnv.All() { + for k, v := range taskEnv.Map() { if _, ok := t.Env[k]; !ok { t.Env[k] = v }