fix envutil tests

pkg/envutil/envhash.go

@@ -0,0 +1,7 @@
+package envutil
+
+type Hash string
+
+func (h *Hash) String() string {
+	return string(*h)
+}

pkg/envutil/envutil.go

@@ -23,8 +23,6 @@ func Merge(a []string, b []string) []string {
 		return r
 	}
 
-	println("herererr")
-
 	for _, v := range b {
 		pair := strings.SplitN(v, "=", 2)
 		envKeys[pair[0]] = v

pkg/envutil/envutil_test.go

@@ -1,6 +1,7 @@
 package envutil
 
 import (
+	"sort"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -37,6 +38,9 @@ func TestMergeEnv(t *testing.T) {
 
 	for _, tc := range tests {
 		t.Log(tc.description)
-		assert.Equal(t, tc.expectedResult, Merge(tc.first, tc.second))
+		sort.Strings(tc.expectedResult)
+		result := Merge(tc.first, tc.second)
+		sort.Strings(result)
+		assert.Equal(t, tc.expectedResult, result)
 	}
 }

pkg/envutil/store.go

@@ -0,0 +1,7 @@
+package envutil
+
+type Store map[Hash][]string
+
+func NewStore() Store {
+	return make(Store)
+}