From 314b161695daae7dfa8739afb1865a3be5ff53ca Mon Sep 17 00:00:00 2001 From: Valery Piashchynski 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/metrics/config_test.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'service/metrics/config_test.go') diff --git a/service/metrics/config_test.go b/service/metrics/config_test.go index 4b223905..a64e9047 100644 --- a/service/metrics/config_test.go +++ b/service/metrics/config_test.go @@ -11,7 +11,10 @@ import ( type mockCfg struct{ cfg string } func (cfg *mockCfg) Get(name string) service.Config { return nil } -func (cfg *mockCfg) Unmarshal(out interface{}) error { return json.Unmarshal([]byte(cfg.cfg), out) } +func (cfg *mockCfg) Unmarshal(out interface{}) error { + j := json.ConfigCompatibleWithStandardLibrary + return j.Unmarshal([]byte(cfg.cfg), out) +} func Test_Config_Hydrate_Error1(t *testing.T) { cfg := &mockCfg{`{"request": {"From": "Something"}}`} -- cgit v1.2.3