From 249cba1ad6e2623949e635e18c5bbaf6751b0dd9 Mon Sep 17 00:00:00 2001 From: Ingo Oppermann Date: Mon, 15 Aug 2022 15:51:29 +0300 Subject: [PATCH] Fix tests --- net/iplimit_test.go | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/net/iplimit_test.go b/net/iplimit_test.go index 7016cc12..ccf2f156 100644 --- a/net/iplimit_test.go +++ b/net/iplimit_test.go @@ -3,57 +3,57 @@ package net import ( "testing" - "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestIPLimiterNew(t *testing.T) { var err error _, err = NewIPLimiter([]string{}, []string{}) - assert.Nil(t, err) + require.Nil(t, err) - _, err = NewIPLimiter([]string{"::1/128", "127.0.0.1/32", ""}, []string{}) - assert.Nil(t, err) + _, err = NewIPLimiter([]string{"::1/128", "127.0.0.1/32"}, []string{}) + require.Nil(t, err) - _, err = NewIPLimiter([]string{}, []string{"::1/128", "127.0.0.1/32", ""}) - assert.Nil(t, err) + _, err = NewIPLimiter([]string{}, []string{"::1/128", "127.0.0.1/32"}) + require.Nil(t, err) } func TestIPLimiterError(t *testing.T) { var err error _, err = NewIPLimiter([]string{}, []string{}) - assert.Nil(t, err) + require.Nil(t, err) _, err = NewIPLimiter([]string{"::1"}, []string{}) - assert.NotNil(t, err, "Should not accept invalid IP") + require.Nil(t, err, "Should accept IP") _, err = NewIPLimiter([]string{}, []string{"::1"}) - assert.NotNil(t, err, "Should not accept invalid IP") + require.Nil(t, err, "Should accept IP") } func TestIPLimiterInvalidIPs(t *testing.T) { limiter, _ := NewIPLimiter([]string{}, []string{}) - assert.False(t, limiter.IsAllowed(""), "Invalid IP shouldn't be allowed") + require.False(t, limiter.IsAllowed(""), "Invalid IP shouldn't be allowed") } func TestIPLimiterNoIPs(t *testing.T) { limiter, _ := NewIPLimiter([]string{}, []string{}) - assert.True(t, limiter.IsAllowed("127.0.0.1"), "IP should be allowed") + require.True(t, limiter.IsAllowed("127.0.0.1"), "IP should be allowed") } func TestIPLimiterAllowlist(t *testing.T) { limiter, _ := NewIPLimiter([]string{}, []string{"::1/128"}) - assert.False(t, limiter.IsAllowed("127.0.0.1"), "Unallowed IP shouldn't be allowed") - assert.True(t, limiter.IsAllowed("::1"), "Allowed IP should be allowed") + require.False(t, limiter.IsAllowed("127.0.0.1"), "Unallowed IP shouldn't be allowed") + require.True(t, limiter.IsAllowed("::1"), "Allowed IP should be allowed") } func TestIPLimiterBlocklist(t *testing.T) { limiter, _ := NewIPLimiter([]string{"::1/128"}, []string{}) - assert.True(t, limiter.IsAllowed("127.0.0.1"), "Allowed IP should be allowed") - assert.False(t, limiter.IsAllowed("::1"), "Unallowed IP shouldn't be allowed") + require.True(t, limiter.IsAllowed("127.0.0.1"), "Allowed IP should be allowed") + require.False(t, limiter.IsAllowed("::1"), "Unallowed IP shouldn't be allowed") }