Refactoring e2e tests #625

ashetty1 · 2018-08-08T09:47:55Z

demo_test.go and e2e_test.go have a lot of duplicate tests. With this PR, I am moving all the component related tests will be moved to cmp_test.go, and have deleted demo_test.go.

Part of the refactoring effort at #576

kadel · 2018-08-08T10:13:00Z

@ashetty1 Please add a link to the issue for every PR that you open. Also, some description would be nice ;-)

kadel · 2018-08-15T11:47:09Z

tests/e2e/README.md

@@ -17,39 +17,43 @@ Run `make test-e2e` to execute the tests.
 | `project create` | Y |
 | `project get` | Y |
 | `project delete` | Y |
-| `project list` | N |
+| `project list` | Y |


I guess that this should be N as it is commented out.

ashetty1 · 2018-08-30T04:53:53Z

@surajnarwade @cdrage @anmolbabu @mik-dass @syamgk please review!

syamgk · 2018-08-30T06:10:33Z

tests/e2e/cmp_test.go

+)
+
+// SourceTest checks the component-source-type and the source url in the annotation of the bc and dc
+// appTestName is the app of the app


name of the app?

anmolbabu · 2018-08-30T06:05:10Z

tests/e2e/cmp_test.go

+// source is the source of the component i.e gitUrl or path to the directory or binary file
+func SourceTest(appTestName string, sourceType string, source string) {
+	// checking for source-type in dc
+	getDc := runCmd("oc get dc wildfly-" + appTestName + " -o go-template='{{index .metadata.annotations \"app.kubernetes.io/component-source-type\"}}'")


can we extract out wildfly or the component type also to parameter in all the lines in this func?

@anmolbabu this is an old function. I just did some rearrangement of tests with this PR. Let me see if I can change that. I agree with you, it would be nice to do that.

syamgk · 2018-08-30T06:28:42Z

tests/e2e/e2e_test.go

+
+		// Failing: Issue #630
+		// It("should list the project", func() {
+		// 	listProj := runCmd("odo project list")


this test need not be commented
replace listProj := runCmd("odo project list") with listProj := runCmd("sleep 2s && odo project list")

refer comment on #630 (comment)

anmolbabu · 2018-08-30T08:55:14Z

tests/e2e/cmp_test.go

@@ -0,0 +1,370 @@
+// +build !race


Should we also move the following:

odo/tests/e2e/e2e_test.go

Lines 65 to 82 in c4cab72

Context("creating component without an application", func() {

It("should create the component in default application", func() {

runCmd("odo create php testcmp")

getCmp := runCmd("odo component get --short")

Expect(getCmp).To(Equal("testcmp"))

getApp := runCmd("odo app get --short")

Expect(getApp).To(Equal("app"))

})

It("should be able to delete the component", func() {

runCmd("odo delete testcmp -f")

getCmp := runCmd("odo list")

Expect(getCmp).NotTo(ContainSubstring("testcmp"))

})

})

odo/tests/e2e/e2e_test.go

Lines 120 to 189 in c4cab72

Describe("creating a component", func() {

Context("when application exists", func() {

It("should create a component", func() {

runCmd("git clone https://github.com/openshift/nodejs-ex " +

tmpDir + "/nodejs-ex")

// TODO: add tests for --git

runCmd("odo create nodejs --local " + tmpDir + "/nodejs-ex")

runCmd("odo push")

})

It("should be the get the component created as active component", func() {

cmp := runCmd("odo component get --short")

Expect(cmp).To(Equal("nodejs"))

})

It("should create the component within the application", func() {

getApp := runCmd("odo app get --short")

Expect(getApp).To(Equal(appTestName))

})

It("should list the components within the application", func() {

cmpList := runCmd("odo list")

Expect(cmpList).To(ContainSubstring("nodejs"))

})

It("should be able to create multiple components within the same application", func() {

runCmd("odo create php")

})

It("should list the newly created second component", func() {

cmpList := runCmd("odo list")

Expect(cmpList).To(ContainSubstring("php"))

})

It("should get the application "+appTestName, func() {

appGet := runCmd("odo app get --short")

Expect(appGet).To(Equal(appTestName))

})

It("should be able to set a component as active", func() {

cmpSet := runCmd("odo component set nodejs")

Expect(cmpSet).To(ContainSubstring("nodejs"))

})

It("should be able to retrieve logs", func() {

runCmd("odo log")

runCmd("odo log nodejs")

})

It("should be able to create git component with required ports", func() {

runCmd("odo create nodejs nodejs-git --git https://github.com/openshift/nodejs-ex --port 8080/tcp,9100/udp")

// checking port names

portsNames := runCmd("oc get services nodejs-git-" + appTestName + " -o go-template='{{range .spec.ports}}{{.name}}{{end}}'")

Expect(portsNames).To(ContainSubstring("8080-tcp"))

Expect(portsNames).To(ContainSubstring("9100-udp"))

// checking port numbers

ports := runCmd("oc get services nodejs-git-" + appTestName + " -o go-template='{{range .spec.ports}}{{.port}}{{end}}'")

Expect(ports).To(ContainSubstring("8080"))

Expect(ports).To(ContainSubstring("9100"))

// checking protocols

protocols := runCmd("oc get services nodejs-git-" + appTestName + " -o go-template='{{range .spec.ports}}{{.protocol}}{{end}}'")

Expect(protocols).To(ContainSubstring("TCP"))

Expect(protocols).To(ContainSubstring("UDP"))

})

})

})

also here?

@anmolbabu nope. We need a few basic component tests in e2e_test.go too.

ashetty1 · 2018-09-04T11:27:16Z

@surajnarwade @anmolbabu @mik-dass guys one final review and merge?

cdrage · 2018-09-04T14:37:17Z

This LGTM!

demo_test.go and e2e_test.go have a lot of duplicate tests. With this PR, I am moving all the component related tests to cmp_test.go, and am removing demo_test.go. We will continue to add more component tests to cmp_test.go

anmolbabu · 2018-09-05T04:28:27Z

@surajnarwade @syamgk @mik-dass Can you guys review this PR.
I think we can push it in if we manage to gain may be 1 more approval(It has 2 approvals already)

surajnarwade

LGTM 😄

ashetty1 added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. Required by Prow. label Aug 8, 2018

ashetty1 force-pushed the update-tests-e2e branch from 89a661f to cc40975 Compare August 8, 2018 09:50

ashetty1 mentioned this pull request Aug 9, 2018

Adding tests for odo create with git source #437

Closed

ashetty1 force-pushed the update-tests-e2e branch 7 times, most recently from 818f66c to e5e53f9 Compare August 14, 2018 14:43

ashetty1 mentioned this pull request Aug 14, 2018

odo project list failing on travis #630

Closed

ashetty1 force-pushed the update-tests-e2e branch from e5e53f9 to 9a1bbb7 Compare August 14, 2018 15:13

ashetty1 changed the title ~~[WIP] Refactoring e2e tests~~ Refactoring e2e tests Aug 14, 2018

kadel reviewed Aug 15, 2018

View reviewed changes

ashetty1 removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. Required by Prow. label Aug 16, 2018

ashetty1 force-pushed the update-tests-e2e branch 6 times, most recently from 4df9bc0 to 498a7ef Compare August 20, 2018 09:53

ashetty1 force-pushed the update-tests-e2e branch from 498a7ef to c4cab72 Compare August 30, 2018 04:33

syamgk reviewed Aug 30, 2018

View reviewed changes

anmolbabu reviewed Aug 30, 2018

View reviewed changes

syamgk reviewed Aug 30, 2018

View reviewed changes

anmolbabu reviewed Aug 30, 2018

View reviewed changes

ashetty1 force-pushed the update-tests-e2e branch 2 times, most recently from 521a00b to 3c5405b Compare August 30, 2018 11:12

cdrage approved these changes Sep 4, 2018

View reviewed changes

surajnarwade added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. Required by Prow. label Sep 5, 2018

anmolbabu approved these changes Sep 5, 2018

View reviewed changes

Refactoring component e2e tests:

7a75571

demo_test.go and e2e_test.go have a lot of duplicate tests. With this PR, I am moving all the component related tests to cmp_test.go, and am removing demo_test.go. We will continue to add more component tests to cmp_test.go

ashetty1 force-pushed the update-tests-e2e branch from 3c5405b to 7a75571 Compare September 5, 2018 03:50

ashetty1 removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. Required by Prow. label Sep 5, 2018

surajnarwade approved these changes Sep 5, 2018

View reviewed changes

surajnarwade merged commit d1a57e5 into redhat-developer:master Sep 5, 2018

surajnarwade mentioned this pull request Sep 5, 2018

Cleanup and reorganise e2e test #576

Closed

snyk-bot mentioned this pull request Nov 29, 2021

[Snyk] Security upgrade @svgr/webpack from 5.5.0 to 6.0.0 adamkeinan/odo#15

Open

This was referenced Sep 30, 2022

[Snyk] Fix for 16 vulnerabilities adamkeinan/odo#50

Open

[Snyk] Fix for 16 vulnerabilities adamkeinan/odo#51

Open

[Snyk] Fix for 16 vulnerabilities adamkeinan/odo#52

Open

adamkeinan mentioned this pull request Oct 7, 2022

[Snyk] Fix for 16 vulnerabilities adamkeinan/odo#53

Open

adamkeinan mentioned this pull request May 22, 2023

[Snyk] Fix for 1 vulnerabilities adamkeinan/odo#77

Open

adamkeinan mentioned this pull request Dec 19, 2023

[Snyk] Security upgrade @svgr/webpack from 5.5.0 to 6.0.0 adamkeinan/odo#97

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactoring e2e tests #625

Refactoring e2e tests #625

ashetty1 commented Aug 8, 2018 •

edited

kadel commented Aug 8, 2018

kadel Aug 15, 2018

ashetty1 commented Aug 30, 2018

syamgk Aug 30, 2018

anmolbabu Aug 30, 2018

ashetty1 Aug 30, 2018

syamgk Aug 30, 2018

anmolbabu Aug 30, 2018

ashetty1 Aug 30, 2018

ashetty1 commented Sep 4, 2018

cdrage commented Sep 4, 2018

anmolbabu commented Sep 5, 2018

surajnarwade left a comment

	Context("creating component without an application", func() {
	It("should create the component in default application", func() {
	runCmd("odo create php testcmp")

	getCmp := runCmd("odo component get --short")
	Expect(getCmp).To(Equal("testcmp"))

	getApp := runCmd("odo app get --short")
	Expect(getApp).To(Equal("app"))
	})

	It("should be able to delete the component", func() {
	runCmd("odo delete testcmp -f")

	getCmp := runCmd("odo list")
	Expect(getCmp).NotTo(ContainSubstring("testcmp"))
	})
	})

	Describe("creating a component", func() {
	Context("when application exists", func() {
	It("should create a component", func() {
	runCmd("git clone https://github.com/openshift/nodejs-ex " +
	tmpDir + "/nodejs-ex")

	// TODO: add tests for --git
	runCmd("odo create nodejs --local " + tmpDir + "/nodejs-ex")
	runCmd("odo push")
	})

	It("should be the get the component created as active component", func() {
	cmp := runCmd("odo component get --short")
	Expect(cmp).To(Equal("nodejs"))
	})

	It("should create the component within the application", func() {
	getApp := runCmd("odo app get --short")
	Expect(getApp).To(Equal(appTestName))
	})

	It("should list the components within the application", func() {
	cmpList := runCmd("odo list")
	Expect(cmpList).To(ContainSubstring("nodejs"))
	})

	It("should be able to create multiple components within the same application", func() {
	runCmd("odo create php")
	})

	It("should list the newly created second component", func() {
	cmpList := runCmd("odo list")
	Expect(cmpList).To(ContainSubstring("php"))
	})

	It("should get the application "+appTestName, func() {
	appGet := runCmd("odo app get --short")
	Expect(appGet).To(Equal(appTestName))
	})

	It("should be able to set a component as active", func() {
	cmpSet := runCmd("odo component set nodejs")
	Expect(cmpSet).To(ContainSubstring("nodejs"))
	})

	It("should be able to retrieve logs", func() {
	runCmd("odo log")
	runCmd("odo log nodejs")
	})

	It("should be able to create git component with required ports", func() {
	runCmd("odo create nodejs nodejs-git --git https://github.com/openshift/nodejs-ex --port 8080/tcp,9100/udp")

	// checking port names
	portsNames := runCmd("oc get services nodejs-git-" + appTestName + " -o go-template='{{range .spec.ports}}{{.name}}{{end}}'")
	Expect(portsNames).To(ContainSubstring("8080-tcp"))
	Expect(portsNames).To(ContainSubstring("9100-udp"))

	// checking port numbers
	ports := runCmd("oc get services nodejs-git-" + appTestName + " -o go-template='{{range .spec.ports}}{{.port}}{{end}}'")
	Expect(ports).To(ContainSubstring("8080"))
	Expect(ports).To(ContainSubstring("9100"))

	// checking protocols
	protocols := runCmd("oc get services nodejs-git-" + appTestName + " -o go-template='{{range .spec.ports}}{{.protocol}}{{end}}'")
	Expect(protocols).To(ContainSubstring("TCP"))
	Expect(protocols).To(ContainSubstring("UDP"))
	})
	})
	})

Refactoring e2e tests #625

Refactoring e2e tests #625

Conversation

ashetty1 commented Aug 8, 2018 • edited

kadel commented Aug 8, 2018

kadel Aug 15, 2018

Choose a reason for hiding this comment

ashetty1 commented Aug 30, 2018

syamgk Aug 30, 2018

Choose a reason for hiding this comment

anmolbabu Aug 30, 2018

Choose a reason for hiding this comment

ashetty1 Aug 30, 2018

Choose a reason for hiding this comment

syamgk Aug 30, 2018

Choose a reason for hiding this comment

anmolbabu Aug 30, 2018

Choose a reason for hiding this comment

ashetty1 Aug 30, 2018

Choose a reason for hiding this comment

ashetty1 commented Sep 4, 2018

cdrage commented Sep 4, 2018

anmolbabu commented Sep 5, 2018

surajnarwade left a comment

Choose a reason for hiding this comment

ashetty1 commented Aug 8, 2018 •

edited