From 314b161695daae7dfa8739afb1865a3be5ff53ca Mon Sep 17 00:00:00 2001
From: Valery Piashchynski <piashchynski_valery@hotmail.com>
Date: Sat, 21 Mar 2020 01:03:13 +0300
Subject: Update GHA, go1.14 vendored mode Update Makefile, add go vendor (go
 1.14 + php hack) Update usage of new json package

---
 service/static/service_test.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'service/static/service_test.go')

diff --git a/service/static/service_test.go b/service/static/service_test.go
index b9e44247..1a137cbc 100644
--- a/service/static/service_test.go
+++ b/service/static/service_test.go
@@ -33,7 +33,8 @@ func (cfg *testCfg) Get(name string) service.Config {
 	return nil
 }
 func (cfg *testCfg) Unmarshal(out interface{}) error {
-	return json.Unmarshal([]byte(cfg.target), out)
+	j := json.ConfigCompatibleWithStandardLibrary
+	return j.Unmarshal([]byte(cfg.target), out)
 }
 
 func get(url string) (string, *http.Response, error) {
@@ -443,7 +444,8 @@ func Test_Files_NotForbid(t *testing.T) {
 
 func tmpDir() string {
 	p := os.TempDir()
-	r, _ := json.Marshal(p)
+	j := json.ConfigCompatibleWithStandardLibrary
+	r, _ := j.Marshal(p)
 
 	return string(r)
 }
-- 
cgit v1.2.3