Update tests to work on OpenShift #323
Conversation
|
This change is |
Signed-off-by: Kevin Earls <[email protected]>
|
@pavolloffay @objectiser @jpkrohling Please review |
Codecov Report
@@ Coverage Diff @@
## master #323 +/- ##
=======================================
Coverage 88.94% 88.94%
=======================================
Files 69 69
Lines 3112 3112
=======================================
Hits 2768 2768
Misses 234 234
Partials 110 110Continue to review full report at Codecov.
|
test/e2e/daemonset.go
Outdated
| req, err := http.NewRequest(http.MethodGet, url, nil) | ||
| if err != nil { | ||
| return err | ||
| func getJaegerDefinition(namespace string, name string) *v1.Jaeger { |
There was a problem hiding this comment.
Think this needs to be renamed to indicate it is returning a AgentAsDaemonSet definition.
test/e2e/daemonset_with_ingress.go
Outdated
| @@ -0,0 +1,111 @@ | |||
| package e2e | |||
There was a problem hiding this comment.
Testing the ingress should be independent of the agent, whether deployed daemonset or sidecar. Might be better to have variants of the all-in-one-test.go and production-test.go that use ingress instead of port-forward?
test/e2e/all_in_one_test.go
Outdated
| defer portForward.Close() | ||
| defer close(closeChan) | ||
|
|
||
|
|
test/e2e/daemonset.go
Outdated
| }) | ||
| } | ||
|
|
||
|
|
There was a problem hiding this comment.
nit: remove two extra lines
Routes can be queried with the same API as other objects You can use this PR to see how we know that we are running on OCP or k8s #217 |
Signed-off-by: Kevin Earls <[email protected]>
|
HI @objectiser I've updated this based on your previous comments. Could you please take another look? |
|
@objectiser I'm looking at that now. If possible though I'd like to get this merged and add that as a separate issue. |
|
@kevinearls that is fine with me. |
|
@objectiser Thanks. Can you merge it then, or do I need review from @pavolloffay and @jpkrohling too? |
This is the second set of changes for #227. I've done the following