Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
7050a847
Unverified
Commit
7050a847
authored
Nov 13, 2018
by
k8s-ci-robot
Committed by
GitHub
Nov 13, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #70789 from seunghunee/roundtrip-bugfix
Fix e2e conformance test error
parents
1777be5f
c0cacd25
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
util.go
test/e2e/framework/util.go
+3
-3
No files found.
test/e2e/framework/util.go
View file @
7050a847
...
...
@@ -4320,13 +4320,13 @@ func (rt *extractRT) RoundTrip(req *http.Request) (*http.Response, error) {
// headersForConfig extracts any http client logic necessary for the provided
// config.
func
headersForConfig
(
c
*
restclient
.
Config
)
(
http
.
Header
,
error
)
{
func
headersForConfig
(
c
*
restclient
.
Config
,
url
*
url
.
URL
)
(
http
.
Header
,
error
)
{
extract
:=
&
extractRT
{}
rt
,
err
:=
restclient
.
HTTPWrappersForConfig
(
c
,
extract
)
if
err
!=
nil
{
return
nil
,
err
}
if
_
,
err
:=
rt
.
RoundTrip
(
&
http
.
Request
{});
err
!=
nil
{
if
_
,
err
:=
rt
.
RoundTrip
(
&
http
.
Request
{
URL
:
url
});
err
!=
nil
{
return
nil
,
err
}
return
extract
.
Header
,
nil
...
...
@@ -4350,7 +4350,7 @@ func OpenWebSocketForURL(url *url.URL, config *restclient.Config, protocols []st
url
.
Host
+=
":80"
}
}
headers
,
err
:=
headersForConfig
(
config
)
headers
,
err
:=
headersForConfig
(
config
,
url
)
if
err
!=
nil
{
return
nil
,
fmt
.
Errorf
(
"failed to load http headers: %v"
,
err
)
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment