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.

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

Ported guestbook.sh e2e test to ginkgo #5439

Merged
merged 1 commit into from
Mar 16, 2015

Conversation

piosz
Copy link
Member

@piosz piosz commented Mar 13, 2015

This fixed #5045

@piosz
Copy link
Member Author

piosz commented Mar 13, 2015

Please note that the test may cause some problems due to #5431

Describe("guestbook", func() {
var (
guestbookPath = filepath.Join(testContext.repoRoot, "examples/guestbook")
frontendSelector = "name=frontend"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The vars here that are just strings should be defined in a const block instead of a var block:

const (
frontendSelector = "name=frontend"
redisMasterSelector = "name=redis-master"
redisSlave = "name=redis-slave"
)
var guestbookPath = filepath.Join(...)

@roberthbailey roberthbailey assigned roberthbailey and unassigned ixdy Mar 13, 2015
@piosz
Copy link
Member Author

piosz commented Mar 13, 2015

Thanks for comments. PTAL

@roberthbailey
Copy link
Contributor

LGTM. Please squash before I merge (on Monday). I take it that I should merge #5452 first though.

@roberthbailey roberthbailey added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 14, 2015
@roberthbailey roberthbailey added this to the Test Issue Fix-it milestone Mar 14, 2015
@piosz
Copy link
Member Author

piosz commented Mar 16, 2015

Squashed. Thanks for review!

@piosz
Copy link
Member Author

piosz commented Mar 16, 2015

Also should be submitted after #5504

redisMasterSelector = "name=redis-master"
redisSlaveSelector = "name=redis-slave"
kubectlProxyPort = 8011
guestbookResponseTimeout = 2 * time.Minute
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would bump this to 10 minutes. This timeout includes waiting for multiple pods/services/replication controllers to be created. The default pod creation timeout we use is 5 minutes.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To add a bit of explanation, the longer timeout helps reduce flakiness from slow, serialized docker image pulls (see #4566).

@j3ffml j3ffml assigned j3ffml and unassigned roberthbailey Mar 16, 2015
@roberthbailey
Copy link
Contributor

Travis (finally) passed. Merging.

roberthbailey added a commit that referenced this pull request Mar 16, 2015
Ported guestbook.sh e2e test to ginkgo
@roberthbailey roberthbailey merged commit 0fe77d4 into kubernetes:master Mar 16, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Port guestbook.sh to ginkgo
5 participants