Skip to content

Commit 69f42f0

Browse files
committed
Fix test after rebase
1 parent a946d23 commit 69f42f0

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

internal/mode/static/nginx/config/generator_test.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,17 +115,12 @@ func TestGenerate(t *testing.T) {
115115
g.Expect(files[3].Content).To(Equal([]byte("load_module modules/ngx_otel_module.so;")))
116116

117117
g.Expect(files[4].Path).To(Equal("/etc/nginx/secrets/test-certbundle.crt"))
118-
certBundle := string(files[3].Content)
118+
certBundle := string(files[4].Content)
119119
g.Expect(certBundle).To(Equal("test-cert"))
120120

121-
<<<<<<< HEAD
122121
g.Expect(files[5]).To(Equal(file.File{
123122
Type: file.TypeSecret,
124123
Path: "/etc/nginx/secrets/test-keypair.pem",
125124
Content: []byte("test-cert\ntest-key"),
126125
}))
127-
=======
128-
g.Expect(files[4].Path).To(Equal("/etc/nginx/module-includes/load-modules.conf"))
129-
g.Expect(files[4].Content).To(Equal([]byte("load_module modules/ngx_otel_module.so;")))
130-
>>>>>>> dfc23a2 (Code review)
131126
}

0 commit comments

Comments
 (0)