From 45d777280833240ebf7cd67688fbcf571ed4d2d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sun, 24 Jan 2021 16:26:31 +0100 Subject: [PATCH] Properly compare versions equal or over to 1.15 in TestMustGetParsedDuration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix #52 Signed-off-by: Robert-André Mauchin --- properties_test.go | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/properties_test.go b/properties_test.go index 6969cf7..a575ecc 100644 --- a/properties_test.go +++ b/properties_test.go @@ -560,12 +560,17 @@ func TestMustGetParsedDuration(t *testing.T) { assert.Equal(t, p.MustGetParsedDuration("key"), 123*time.Millisecond) ver := runtime.Version() - switch { - // gotip and go1.15 will return `time: invalid duration "ghi"` - case !strings.HasPrefix(ver, "go") || strings.HasPrefix(ver, "go1.15"): - assert.Panic(t, func() { p.MustGetParsedDuration("key2") }, `time: invalid duration "ghi"`) - default: - assert.Panic(t, func() { p.MustGetParsedDuration("key2") }, `time: invalid duration ghi`) + if strings.HasPrefix(ver, "go") { + ver_minor := ver[4:6] + switch { + // gotip and go1.15 will return `time: invalid duration "ghi"` + case ver_minor >= "15": + assert.Panic(t, func() { p.MustGetParsedDuration("key2") }, `time: invalid duration "ghi"`) + default: + assert.Panic(t, func() { p.MustGetParsedDuration("key2") }, `time: invalid duration ghi`) + } + } else { + assert.Panic(t, func() { p.MustGetParsedDuration("key2") }, `time: invalid duration "ghi"`) } assert.Panic(t, func() { p.MustGetParsedDuration("invalid") }, "unknown property: invalid")