Skip to content

Try to fixup #2117#2586

Merged
mattmoor merged 3 commits intoknative:masterfrom
mattmoor:allow-resources
Nov 30, 2018
Merged

Try to fixup #2117#2586
mattmoor merged 3 commits intoknative:masterfrom
mattmoor:allow-resources

Conversation

@mattmoor
Copy link
Copy Markdown
Member

This is me trying to fixup and finish #2117

@googlebot
Copy link
Copy Markdown

So there's good news and bad news.

👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.

😕 The bad news is that it appears that one or more commits were authored or co-authored by someone other than the pull request submitter. We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that here in the pull request.

Note to project maintainer: This is a terminal state, meaning the cla/google commit status will not change from this state. It's up to you to confirm consent of all the commit author(s), set the cla label to yes (if enabled on your project), and then merge this pull request when appropriate.

@knative-prow-robot
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mattmoor

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@knative-prow-robot knative-prow-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Nov 30, 2018
Copy link
Copy Markdown
Contributor

@knative-prow-robot knative-prow-robot left a comment

Choose a reason for hiding this comment

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

@mattmoor: 4 warnings.

Details

In response to this:

This is me trying to fixup and finish #2117

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Comment thread test/e2e/resources_test.go Outdated
}

if !equality.Semantic.DeepEqual(c.Resources, want) {
return false, fmt.Errorf("Invalid resource configuration for pod %v. Want: %+v, got: %+v.", pod.Name, want, c.Resources)
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Golint errors: error strings should not be capitalized or end with punctuation or a newline. More info.

Comment thread test/e2e/resources_test.go Outdated

if !equality.Semantic.DeepEqual(c.Resources, want) {
return false, fmt.Errorf("Invalid resource configuration for pod %v. Want: %+v, got: %+v.", pod.Name, want, c.Resources)
} else {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Golint indent: if block ends with a return statement, so drop this else and outdent its block. More info.

Comment thread test/e2e/resources_test.go Outdated
}
want := "Moo!"
if want != strings.TrimSpace(string(response.Body)) {
return fmt.Errorf("The response '%s' is not equal to expected response '%s'.", string(response.Body), want)
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Golint errors: error strings should not be capitalized or end with punctuation or a newline. More info.

fmt.Fprintf(w, "cannot convert %s to int", memoryInMB)
w.WriteHeader(http.StatusBadRequest)
return
} else {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Golint indent: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary). More info.

@mattmoor
Copy link
Copy Markdown
Member Author

/test pull-knative-serving-unit-tests

@mattmoor
Copy link
Copy Markdown
Member Author

Let's see if it sticks...

/test pull-knative-serving-unit-tests

@mattmoor
Copy link
Copy Markdown
Member Author

Wrong one to retry 😭

/test pull-knative-serving-integration-tests

@mattmoor
Copy link
Copy Markdown
Member Author

mattmoor commented Nov 30, 2018

$ go test -tags=e2e -count=150 -timeout=30m ./test/e2e -run=TestCustomResourcesLimits
ok      github.com/knative/serving/test/e2e     962.432s

Not bad :)

@mattmoor
Copy link
Copy Markdown
Member Author

@bbrowning Since you were familiar with this, would you mind reviewing my additional changes?

@mattmoor
Copy link
Copy Markdown
Member Author

/lint

Copy link
Copy Markdown
Contributor

@knative-prow-robot knative-prow-robot left a comment

Choose a reason for hiding this comment

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

@mattmoor: 2 warnings.

Details

In response to this:

/lint

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Comment thread test/e2e/resources_test.go Outdated
}

if !equality.Semantic.DeepEqual(c.Resources, want) {
return false, fmt.Errorf("invalid resource configuration for pod %v. Want: %+v, got: %+v.", pod.Name, want, c.Resources)
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Golint errors: error strings should not be capitalized or end with punctuation or a newline. More info.

Comment thread test/e2e/resources_test.go Outdated
return err
}
if want != strings.TrimSpace(string(response.Body)) {
return fmt.Errorf("the response '%s' is not equal to expected response '%s'.", string(response.Body), want)
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Golint errors: error strings should not be capitalized or end with punctuation or a newline. More info.

@mattmoor
Copy link
Copy Markdown
Member Author

/lint

Copy link
Copy Markdown
Contributor

@knative-prow-robot knative-prow-robot left a comment

Choose a reason for hiding this comment

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

@mattmoor: 0 warnings.

Details

In response to this:

/lint

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@mattmoor
Copy link
Copy Markdown
Member Author

One more time for good measure:

/test pull-knative-serving-integration-tests

@bbrowning
Copy link
Copy Markdown
Contributor

Ahh nice - so it was easy to fix this test by just filling out the entire array when bloating memory instead of just first/last elements.

/lgtm

@knative-prow-robot knative-prow-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 30, 2018
@mattmoor
Copy link
Copy Markdown
Member Author

@bbrowning yeah, I had to add a WaitForEndpointState as well because even with that the 100M request will sometimes fail.

@mattmoor
Copy link
Copy Markdown
Member Author

I'm going to override branch protections to merge this. @jszroberto signed the CLA and provided the base PR, this just addresses test/lint issues.

@mattmoor mattmoor merged commit 7b07d51 into knative:master Nov 30, 2018
@mattmoor mattmoor deleted the allow-resources branch November 30, 2018 14:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants