DevFW-CICD/ingress-nginx-helm
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move the resetting logic into framework

Browse source 
Stylistic fixes based on feedback
This commit is contained in:
Andrew Louis 2018-04-16 15:30:35 -04:00
parent 19337f05fb
commit 444914b764
4 changed files with 22 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

9
test/e2e/settings/proxy_protocol.go
View file

@ -35,25 +35,16 @@ var _ = framework.IngressNginxDescribe("Proxy Protocol", func() {
f := framework.NewDefaultFramework("proxy-protocol")
setting := "use-proxy-protocol"
var defaultNginxConfigMapData map[string]string = nil
BeforeEach(func() {
err := f.NewEchoDeployment()
Expect(err).NotTo(HaveOccurred())
if defaultNginxConfigMapData == nil {
defaultNginxConfigMapData, err = f.GetNginxConfigMapData()
Expect(err).NotTo(HaveOccurred())
Expect(defaultNginxConfigMapData).NotTo(BeNil())
}
err = f.UpdateNginxConfigMapData(setting, "false")
Expect(err).NotTo(HaveOccurred())
})
AfterEach(func() {
err := f.SetNginxConfigMapData(defaultNginxConfigMapData)
Expect(err).NotTo(HaveOccurred())
})
It("should respect port passed by the PROXY Protocol", func() {