Skip to content

Commit f0147e1

Browse files
committed
TEST/MINOR: use only client-native v6 in tests
Some tests are using config-parser. Switch the version to client-native v6
1 parent b390cc7 commit f0147e1

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

deploy/tests/e2e/cookie-persistence/cookie-persistence_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"strings"
2222
"testing"
2323

24-
parser "github.com/haproxytech/client-native/v5/config-parser"
25-
"github.com/haproxytech/client-native/v5/config-parser/options"
24+
parser "github.com/haproxytech/client-native/v6/config-parser"
25+
"github.com/haproxytech/client-native/v6/config-parser/options"
2626

2727
"github.com/haproxytech/kubernetes-ingress/deploy/tests/e2e"
2828
"github.com/stretchr/testify/suite"

deploy/tests/e2e/cookie-persistence/suite_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import (
2121

2222
"github.com/stretchr/testify/suite"
2323

24-
parser "github.com/haproxytech/client-native/v5/config-parser"
25-
"github.com/haproxytech/client-native/v5/config-parser/params"
26-
"github.com/haproxytech/client-native/v5/config-parser/types"
24+
parser "github.com/haproxytech/client-native/v6/config-parser"
25+
"github.com/haproxytech/client-native/v6/config-parser/params"
26+
"github.com/haproxytech/client-native/v6/config-parser/types"
2727

2828
"github.com/haproxytech/kubernetes-ingress/deploy/tests/e2e"
2929
)

deploy/tests/e2e/crd/cr_global_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ import (
2121
"strings"
2222
"testing"
2323

24-
parser "github.com/haproxytech/client-native/v5/config-parser"
25-
"github.com/haproxytech/client-native/v5/config-parser/common"
26-
"github.com/haproxytech/client-native/v5/config-parser/options"
27-
"github.com/haproxytech/client-native/v5/config-parser/params"
28-
"github.com/haproxytech/client-native/v5/config-parser/types"
24+
parser "github.com/haproxytech/client-native/v6/config-parser"
25+
"github.com/haproxytech/client-native/v6/config-parser/common"
26+
"github.com/haproxytech/client-native/v6/config-parser/options"
27+
"github.com/haproxytech/client-native/v6/config-parser/params"
28+
"github.com/haproxytech/client-native/v6/config-parser/types"
2929
"github.com/haproxytech/kubernetes-ingress/deploy/tests/e2e"
3030
"github.com/stretchr/testify/suite"
3131
)
@@ -162,7 +162,7 @@ func (suite *GlobalSuite) Test_CR_Global() {
162162
Name: "thread",
163163
Value: "all",
164164
},
165-
&params.BindOptionValue{
165+
&params.BindOptionParams{
166166
Name: "quic-cc-algo",
167167
Value: "newreno",
168168
},

deploy/tests/e2e/crd/suite_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import (
2121

2222
"github.com/stretchr/testify/suite"
2323

24-
parser "github.com/haproxytech/client-native/v5/config-parser"
25-
"github.com/haproxytech/client-native/v5/config-parser/options"
26-
"github.com/haproxytech/client-native/v5/config-parser/types"
24+
parser "github.com/haproxytech/client-native/v6/config-parser"
25+
"github.com/haproxytech/client-native/v6/config-parser/options"
26+
"github.com/haproxytech/client-native/v6/config-parser/types"
2727
"github.com/haproxytech/kubernetes-ingress/deploy/tests/e2e"
2828
)
2929

0 commit comments

Comments
 (0)