Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix unit tests #820

Merged
merged 5 commits into from Jan 24, 2018
Merged

Fix unit tests #820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
18cd905
Updating test, operator ensureCustomResourceDefinitions method is now…
jeffersongirao Jan 23, 2018
fda492d
Updating template tests given Backend now holds a pointer
jeffersongirao Jan 23, 2018
09f1fd7
Avoid null pointer exception in renderer tests when the Backend is unset
jeffersongirao Jan 23, 2018
3ceb484
Removing host_name test case since the filter does not exist
jeffersongirao Jan 23, 2018
bf3fca6
Making backend names unique so testParsedConfig pass the validations
jeffersongirao Jan 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion pkg/haproxy/renderer_test.go
View file
Open in desktop
Expand Up @@ -58,7 +58,9 @@ func TestPathOrdering(t *testing.T) {
for y := range hosts {
host := hosts[y]
for z := range host.Paths {
host.Paths[z].Backend.canonicalize()
if host.Paths[z].Backend != nil {
host.Paths[z].Backend.canonicalize()
}
}

sort.Slice(host.Paths, func(i, j int) bool {
Expand Down
91 changes: 37 additions & 54 deletions pkg/haproxy/template_test.go
View file
Open in desktop
Expand Up @@ -28,23 +28,6 @@ hello
assert.Equal(t, exp, buf.String())
}

func TestHostNameFilter(t *testing.T) {
tpl := template.Must(template.New("").Funcs(funcMap).Parse(`
{{ .val | host_name }}
{{ .val2 | host_name }}
`))
var buf bytes.Buffer
tpl.Execute(&buf, map[string]string{
"val": "appscode.com",
"val2": "*.appscode.com",
})
exp := `
hdr(host) -i appscode.com
hdr_end(host) -i .appscode.com
`
assert.Equal(t, exp, buf.String())
}

func TestTemplate(t *testing.T) {
si := &SharedInfo{
DefaultBackend: &Backend{
Expand Down Expand Up @@ -101,7 +84,7 @@ func TestTemplate(t *testing.T) {
Paths: []*HTTPPath{
{
Path: "/elijah",
Backend: Backend{
Backend: &Backend{
Name: "elijah",
BackendRules: []string{"first rule", "second rule"},
RewriteRules: []string{"first rule", "second rule"},
Expand All @@ -114,7 +97,7 @@ func TestTemplate(t *testing.T) {
},
{
Path: "/nicklause",
Backend: Backend{
Backend: &Backend{
Name: "nicklause",
Endpoints: []*Endpoint{
{Name: "first", IP: "10.244.2.1", Port: "2323"},
Expand All @@ -129,7 +112,7 @@ func TestTemplate(t *testing.T) {
Paths: []*HTTPPath{
{
Path: "/rebeka",
Backend: Backend{
Backend: &Backend{
Name: "rebecka",
RewriteRules: []string{"first rule", "second rule"},
Endpoints: []*Endpoint{
Expand All @@ -153,8 +136,8 @@ func TestTemplate(t *testing.T) {
Paths: []*HTTPPath{
{
Path: "/kool",
Backend: Backend{
Name: "kool",
Backend: &Backend{
Name: "kool1",
Sticky: true,
BackendRules: []string{"first rule", "second rule"},
RewriteRules: []string{"first rule", "second rule"},
Expand All @@ -180,8 +163,8 @@ func TestTemplate(t *testing.T) {
Paths: []*HTTPPath{
{
Path: "/kool",
Backend: Backend{
Name: "kool",
Backend: &Backend{
Name: "kool2",
Sticky: true,
BackendRules: []string{"first rule", "second rule"},
RewriteRules: []string{"first rule", "second rule"},
Expand Down Expand Up @@ -209,8 +192,8 @@ func TestTemplate(t *testing.T) {
Paths: []*HTTPPath{
{
Path: "/yara",
Backend: Backend{
Name: "yara",
Backend: &Backend{
Name: "yara1",
Sticky: true,
Endpoints: []*Endpoint{
{Name: "first", IP: "10.244.2.1", Port: "2323", UseDNSResolver: true, TLSOption: "ssl verify required"},
Expand All @@ -233,8 +216,8 @@ func TestTemplate(t *testing.T) {
Paths: []*HTTPPath{
{
Path: "/yara",
Backend: Backend{
Name: "yara",
Backend: &Backend{
Name: "yara2",
Sticky: true,
Endpoints: []*Endpoint{
{Name: "first", IP: "10.244.2.1", Port: "2323", UseDNSResolver: true, TLSOption: "ssl verify required"},
Expand All @@ -256,8 +239,8 @@ func TestTemplate(t *testing.T) {
Paths: []*HTTPPath{
{
Path: "/yara",
Backend: Backend{
Name: "yara",
Backend: &Backend{
Name: "yara3",
Endpoints: []*Endpoint{
{Name: "first", IP: "10.244.2.1", Port: "2323"},
},
Expand Down Expand Up @@ -305,7 +288,7 @@ func TestTemplate(t *testing.T) {
{
Paths: []*HTTPPath{
{
Backend: Backend{
Backend: &Backend{
Name: "backend-maxconn",
Endpoints: []*Endpoint{
{Name: "first", IP: "10.244.2.1", Port: "2323", MaxConnections: 20, Weight: 2},
Expand All @@ -324,7 +307,7 @@ func TestTemplate(t *testing.T) {
FrontendName: "stefan",
Port: "333",
FrontendRules: []string{},
Backend: Backend{
Backend: &Backend{
Name: "stefan",
BackendRules: []string{"first rule", "second rule"},
Endpoints: []*Endpoint{
Expand All @@ -341,7 +324,7 @@ func TestTemplate(t *testing.T) {
FrontendRules: []string{},
CertFile: "this-is-secret",
PEMName: "secret-pem",
Backend: Backend{
Backend: &Backend{
Name: "daemon",
Endpoints: []*Endpoint{
{Name: "first", IP: "10.244.2.1", Port: "2323"},
Expand All @@ -356,7 +339,7 @@ func TestTemplate(t *testing.T) {
Host: "hello.ok.domain",
Port: "4444",
FrontendRules: []string{},
Backend: Backend{
Backend: &Backend{
Name: "katherin",
Endpoints: []*Endpoint{
{Name: "first", IP: "10.244.2.1", Port: "2323"},
Expand All @@ -371,8 +354,8 @@ func TestTemplate(t *testing.T) {
Host: "hello.ok.domain",
Port: "4444",
FrontendRules: []string{},
Backend: Backend{
Name: "kate-becket",
Backend: &Backend{
Name: "kate-becket1",
Endpoints: []*Endpoint{
{Name: "first", IP: "10.244.2.1", Port: "2323", UseDNSResolver: true},
{Name: "first", IP: "10.244.2.2", Port: "2324", ExternalName: "ext-name"},
Expand All @@ -386,8 +369,8 @@ func TestTemplate(t *testing.T) {
Host: "hello.ok.domain",
Port: "4445",
FrontendRules: []string{},
Backend: Backend{
Name: "kate-becket",
Backend: &Backend{
Name: "kate-becket2",
Endpoints: []*Endpoint{
{Name: "first", IP: "10.244.2.1", Port: "2323", UseDNSResolver: true, TLSOption: "ssl verify none"},
{Name: "first", IP: "10.244.2.2", Port: "2324", ExternalName: "ext-name", TLSOption: "ssl verify required"},
Expand All @@ -399,8 +382,8 @@ func TestTemplate(t *testing.T) {
FrontendName: "with-sticky-options",
Host: "hello.ok.domain",
Port: "4449",
Backend: Backend{
Name: "kate-becket",
Backend: &Backend{
Name: "kate-becket3",
Sticky: true,
Endpoints: []*Endpoint{
{Name: "first", IP: "10.244.2.1", Port: "2323", UseDNSResolver: true, TLSOption: "ssl verify none"},
Expand All @@ -413,8 +396,8 @@ func TestTemplate(t *testing.T) {
FrontendName: "with-frontend-rules",
Port: "4445",
FrontendRules: []string{"rule one", "rule two"},
Backend: Backend{
Name: "kate-becket",
Backend: &Backend{
Name: "kate-becket4",
Endpoints: []*Endpoint{
{Name: "first", IP: "10.244.2.1", Port: "2323"},
{Name: "first", IP: "10.244.2.2", Port: "2324"},
Expand Down Expand Up @@ -497,7 +480,7 @@ func TestTemplateAuth(t *testing.T) {
Paths: []*HTTPPath{
{
Path: "/elijah",
Backend: Backend{
Backend: &Backend{
Name: "elijah",
Endpoints: []*Endpoint{
{Name: "first", IP: "10.244.2.1", Port: "2323"},
Expand All @@ -507,7 +490,7 @@ func TestTemplateAuth(t *testing.T) {
},
{
Path: "/nicklause",
Backend: Backend{
Backend: &Backend{
Name: "nicklause",
Endpoints: []*Endpoint{
{Name: "first", IP: "10.244.2.1", Port: "2323"},
Expand All @@ -529,7 +512,7 @@ func TestTemplateAuth(t *testing.T) {
Paths: []*HTTPPath{
{
Path: "/kool",
Backend: Backend{
Backend: &Backend{
Name: "kool",
Endpoints: []*Endpoint{
{Name: "first", IP: "10.244.2.1", Port: "2323", UseDNSResolver: true},
Expand All @@ -548,7 +531,7 @@ func TestTemplateAuth(t *testing.T) {
FrontendName: "stefan",
Port: "333",
FrontendRules: []string{},
Backend: Backend{
Backend: &Backend{
Name: "stefan",
BackendRules: []string{"first rule", "second rule"},
Endpoints: []*Endpoint{
Expand Down Expand Up @@ -596,7 +579,7 @@ func TestTemplateServiceAuth(t *testing.T) {
Paths: []*HTTPPath{
{
Path: "/elijah",
Backend: Backend{
Backend: &Backend{
Name: "elijah",
Endpoints: []*Endpoint{
{Name: "first", IP: "10.244.2.1", Port: "2323"},
Expand All @@ -610,7 +593,7 @@ func TestTemplateServiceAuth(t *testing.T) {
},
{
Path: "/nicklause",
Backend: Backend{
Backend: &Backend{
Name: "nicklause",
Endpoints: []*Endpoint{
{Name: "first", IP: "10.244.2.1", Port: "2323"},
Expand Down Expand Up @@ -680,8 +663,8 @@ func TestTLSAuth(t *testing.T) {
Paths: []*HTTPPath{
{
Path: "/elijah",
Backend: Backend{
Name: "elijah",
Backend: &Backend{
Name: "elijah1",
Endpoints: []*Endpoint{
{Name: "first", IP: "10.244.2.1", Port: "2323"},
{Name: "first", IP: "10.244.2.2", Port: "2324"},
Expand All @@ -706,8 +689,8 @@ func TestTLSAuth(t *testing.T) {
Paths: []*HTTPPath{
{
Path: "/elijah",
Backend: Backend{
Name: "elijah",
Backend: &Backend{
Name: "elijah2",
Endpoints: []*Endpoint{
{Name: "first", IP: "10.244.2.1", Port: "2323"},
{Name: "first", IP: "10.244.2.2", Port: "2324"},
Expand Down Expand Up @@ -755,7 +738,7 @@ func TestHealthCheck(t *testing.T) {
Paths: []*HTTPPath{
{
Path: "/elijah",
Backend: Backend{
Backend: &Backend{
Name: "elijah",
Endpoints: []*Endpoint{
{Name: "aaa", IP: "10.244.2.1", Port: "2323"},
Expand All @@ -776,7 +759,7 @@ func TestHealthCheck(t *testing.T) {
FrontendName: "stefan",
Port: "333",
FrontendRules: []string{},
Backend: Backend{
Backend: &Backend{
Name: "stefan",
Endpoints: []*Endpoint{
{Name: "aaa", IP: "10.244.2.1", Port: "2323"},
Expand Down
2 changes: 1 addition & 1 deletion pkg/operator/operator_test.go
View file
Open in desktop
Expand Up @@ -26,7 +26,7 @@ func TestEnsureCustomResourceDefinitions(t *testing.T) {
}

op := Operator{CRDClient: crdClient, KubeClient: kubernetes.NewForConfigOrDie(config)}
if assert.Nil(t, op.ensureCustomResourceDefinitions()) {
if assert.Nil(t, op.Setup()) {
rs, err := crdClient.CustomResourceDefinitions().Get("ingresses.voyager.appscode.com", v1.GetOptions{})
if assert.Nil(t, err) {
assert.Equal(t, rs.Name, "ingresses.voyager.appscode.com")
Expand Down