Merge pull request #4932 from hashicorp/b-1172-rkt-env-vars

change to testing utilities to fix rkt tests
hashicorp · Nov 29, 2018 · 6f2502e · 6f2502e
2 parents 97c9e42 + 72ca56d
commit 6f2502e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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
 			}