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
0df7e695
Commit
0df7e695
authored
Jan 12, 2016
by
k8s-merge-robot
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #19458 from davidopp/notsclose
Auto commit by PR queue bot
parents
3cf31e02
8ac48479
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
50 changed files
with
310 additions
and
152 deletions
+310
-152
executor_test.go
contrib/mesos/pkg/executor/executor_test.go
+4
-2
integration_test.go
contrib/mesos/pkg/scheduler/integration/integration_test.go
+2
-1
apiserver_test.go
pkg/apiserver/apiserver_test.go
+0
-0
handlers_test.go
pkg/apiserver/handlers_test.go
+6
-3
proxy_test.go
pkg/apiserver/proxy_test.go
+16
-8
watch_test.go
pkg/apiserver/watch_test.go
+10
-5
listwatch_test.go
pkg/client/cache/listwatch_test.go
+4
-2
chaosclient_test.go
pkg/client/chaosclient/chaosclient_test.go
+4
-2
client_test.go
pkg/client/unversioned/client_test.go
+12
-6
containerinfo_test.go
pkg/client/unversioned/containerinfo_test.go
+4
-2
helper_test.go
pkg/client/unversioned/helper_test.go
+2
-1
portforward_test.go
pkg/client/unversioned/portforward/portforward_test.go
+14
-7
remotecommand_test.go
pkg/client/unversioned/remotecommand/remotecommand_test.go
+12
-6
request_test.go
pkg/client/unversioned/request_test.go
+22
-11
restclient_test.go
pkg/client/unversioned/restclient_test.go
+6
-3
simple_testclient.go
...client/unversioned/testclient/simple/simple_testclient.go
+2
-1
client_test.go
pkg/cloudprovider/providers/mesos/client_test.go
+9
-4
controller_utils_test.go
pkg/controller/controller_utils_test.go
+2
-1
endpoints_controller_test.go
pkg/controller/endpoint/endpoints_controller_test.go
+24
-12
replication_controller_test.go
pkg/controller/replication/replication_controller_test.go
+8
-4
jwt_test.go
pkg/credentialprovider/gcp/jwt_test.go
+2
-1
metadata_test.go
pkg/credentialprovider/gcp/metadata_test.go
+12
-6
genericapiserver_test.go
pkg/genericapiserver/genericapiserver_test.go
+1
-0
helpers_test.go
pkg/kubectl/cmd/util/helpers_test.go
+1
-0
proxy_server_test.go
pkg/kubectl/proxy_server_test.go
+8
-4
builder_test.go
pkg/kubectl/resource/builder_test.go
+6
-3
kubelet_client_test.go
pkg/kubelet/client/kubelet_client_test.go
+2
-1
http_test.go
pkg/kubelet/config/http_test.go
+6
-3
server_test.go
pkg/kubelet/server/server_test.go
+1
-0
master_test.go
pkg/master/master_test.go
+10
-5
http_test.go
pkg/probe/http/http_test.go
+1
-0
tcp_test.go
pkg/probe/tcp/tcp_test.go
+2
-1
proxier_test.go
pkg/proxy/userspace/proxier_test.go
+1
-0
proxy_test.go
pkg/registry/generic/rest/proxy_test.go
+12
-6
streamer_test.go
pkg/registry/generic/rest/streamer_test.go
+2
-1
etcd_util_test.go
pkg/storage/etcd/util/etcd_util_test.go
+4
-2
fake_handler_test.go
pkg/util/fake_handler_test.go
+12
-6
roundtripper_test.go
pkg/util/httpstream/spdy/roundtripper_test.go
+2
-1
upgrade_test.go
pkg/util/httpstream/spdy/upgrade_test.go
+2
-1
transport_test.go
pkg/util/proxy/transport_test.go
+2
-1
conn_test.go
pkg/util/wsstream/conn_test.go
+8
-4
oidc_test.go
plugin/pkg/auth/authenticator/token/oidc/oidc_test.go
+2
-1
factory_test.go
plugin/pkg/scheduler/factory/factory_test.go
+12
-6
util.go
test/component/scheduler/perf/util.go
+2
-1
auth_test.go
test/integration/auth_test.go
+18
-9
extender_test.go
test/integration/extender_test.go
+6
-3
master_utils.go
test/integration/framework/master_utils.go
+2
-1
scheduler_test.go
test/integration/scheduler_test.go
+4
-2
secret_test.go
test/integration/secret_test.go
+2
-1
service_account_test.go
test/integration/service_account_test.go
+2
-1
No files found.
contrib/mesos/pkg/executor/executor_test.go
View file @
0df7e695
...
@@ -128,7 +128,8 @@ func TestExecutorLaunchAndKillTask(t *testing.T) {
...
@@ -128,7 +128,8 @@ func TestExecutorLaunchAndKillTask(t *testing.T) {
// create fake apiserver
// create fake apiserver
testApiServer
:=
NewTestServer
(
t
,
api
.
NamespaceDefault
,
&
podListWatch
.
list
)
testApiServer
:=
NewTestServer
(
t
,
api
.
NamespaceDefault
,
&
podListWatch
.
list
)
defer
testApiServer
.
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer testApiServer.server.Close()
mockDriver
:=
&
MockExecutorDriver
{}
mockDriver
:=
&
MockExecutorDriver
{}
updates
:=
make
(
chan
kubetypes
.
PodUpdate
,
1024
)
updates
:=
make
(
chan
kubetypes
.
PodUpdate
,
1024
)
...
@@ -342,7 +343,8 @@ func TestExecutorFrameworkMessage(t *testing.T) {
...
@@ -342,7 +343,8 @@ func TestExecutorFrameworkMessage(t *testing.T) {
// create fake apiserver
// create fake apiserver
podListWatch
:=
NewMockPodsListWatch
(
api
.
PodList
{})
podListWatch
:=
NewMockPodsListWatch
(
api
.
PodList
{})
testApiServer
:=
NewTestServer
(
t
,
api
.
NamespaceDefault
,
&
podListWatch
.
list
)
testApiServer
:=
NewTestServer
(
t
,
api
.
NamespaceDefault
,
&
podListWatch
.
list
)
defer
testApiServer
.
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer testApiServer.server.Close()
// create and start executor
// create and start executor
mockDriver
:=
&
MockExecutorDriver
{}
mockDriver
:=
&
MockExecutorDriver
{}
...
...
contrib/mesos/pkg/scheduler/integration/integration_test.go
View file @
0df7e695
...
@@ -602,7 +602,8 @@ func (lt lifecycleTest) Start() <-chan LaunchedTask {
...
@@ -602,7 +602,8 @@ func (lt lifecycleTest) Start() <-chan LaunchedTask {
}
}
func
(
lt
lifecycleTest
)
Close
()
{
func
(
lt
lifecycleTest
)
Close
()
{
lt
.
apiServer
.
server
.
Close
()
// TODO: Uncomment when fix #19254
// lt.apiServer.server.Close()
}
}
func
(
lt
lifecycleTest
)
End
()
<-
chan
struct
{}
{
func
(
lt
lifecycleTest
)
End
()
<-
chan
struct
{}
{
...
...
pkg/apiserver/apiserver_test.go
View file @
0df7e695
This diff is collapsed.
Click to expand it.
pkg/apiserver/handlers_test.go
View file @
0df7e695
...
@@ -111,7 +111,8 @@ func TestMaxInFlight(t *testing.T) {
...
@@ -111,7 +111,8 @@ func TestMaxInFlight(t *testing.T) {
}),
}),
),
),
)
)
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
// These should hang, but not affect accounting.
// These should hang, but not affect accounting.
for
i
:=
0
;
i
<
AllowedInflightRequestsNo
;
i
++
{
for
i
:=
0
;
i
<
AllowedInflightRequestsNo
;
i
++
{
...
@@ -173,7 +174,8 @@ func TestReadOnly(t *testing.T) {
...
@@ -173,7 +174,8 @@ func TestReadOnly(t *testing.T) {
}
}
},
},
)))
)))
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
for
_
,
verb
:=
range
[]
string
{
"GET"
,
"POST"
,
"PUT"
,
"DELETE"
,
"CREATE"
}
{
for
_
,
verb
:=
range
[]
string
{
"GET"
,
"POST"
,
"PUT"
,
"DELETE"
,
"CREATE"
}
{
req
,
err
:=
http
.
NewRequest
(
verb
,
server
.
URL
,
nil
)
req
,
err
:=
http
.
NewRequest
(
verb
,
server
.
URL
,
nil
)
if
err
!=
nil
{
if
err
!=
nil
{
...
@@ -199,7 +201,8 @@ func TestTimeout(t *testing.T) {
...
@@ -199,7 +201,8 @@ func TestTimeout(t *testing.T) {
func
(
*
http
.
Request
)
(
<-
chan
time
.
Time
,
string
)
{
func
(
*
http
.
Request
)
(
<-
chan
time
.
Time
,
string
)
{
return
timeout
,
timeoutResp
return
timeout
,
timeoutResp
}))
}))
defer
ts
.
Close
()
// TODO: Uncomment when fix #19254
// defer ts.Close()
// No timeouts
// No timeouts
sendResponse
<-
struct
{}{}
sendResponse
<-
struct
{}{}
...
...
pkg/apiserver/proxy_test.go
View file @
0df7e695
...
@@ -193,7 +193,8 @@ func TestProxyRequestContentLengthAndTransferEncoding(t *testing.T) {
...
@@ -193,7 +193,8 @@ func TestProxyRequestContentLengthAndTransferEncoding(t *testing.T) {
// Write successful response
// Write successful response
w
.
Write
([]
byte
(
successfulResponse
))
w
.
Write
([]
byte
(
successfulResponse
))
}))
}))
defer
downstreamServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer downstreamServer.Close()
// Start the proxy server
// Start the proxy server
serverURL
,
_
:=
url
.
Parse
(
downstreamServer
.
URL
)
serverURL
,
_
:=
url
.
Parse
(
downstreamServer
.
URL
)
...
@@ -204,7 +205,8 @@ func TestProxyRequestContentLengthAndTransferEncoding(t *testing.T) {
...
@@ -204,7 +205,8 @@ func TestProxyRequestContentLengthAndTransferEncoding(t *testing.T) {
}
}
namespaceHandler
:=
handleNamespaced
(
map
[
string
]
rest
.
Storage
{
"foo"
:
simpleStorage
})
namespaceHandler
:=
handleNamespaced
(
map
[
string
]
rest
.
Storage
{
"foo"
:
simpleStorage
})
server
:=
httptest
.
NewServer
(
namespaceHandler
)
server
:=
httptest
.
NewServer
(
namespaceHandler
)
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
// Dial the proxy server
// Dial the proxy server
conn
,
err
:=
net
.
Dial
(
server
.
Listener
.
Addr
()
.
Network
(),
server
.
Listener
.
Addr
()
.
String
())
conn
,
err
:=
net
.
Dial
(
server
.
Listener
.
Addr
()
.
Network
(),
server
.
Listener
.
Addr
()
.
String
())
...
@@ -299,7 +301,8 @@ func TestProxy(t *testing.T) {
...
@@ -299,7 +301,8 @@ func TestProxy(t *testing.T) {
}
}
fmt
.
Fprint
(
out
,
item
.
respBody
)
fmt
.
Fprint
(
out
,
item
.
respBody
)
}))
}))
defer
downstreamServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer downstreamServer.Close()
serverURL
,
_
:=
url
.
Parse
(
downstreamServer
.
URL
)
serverURL
,
_
:=
url
.
Parse
(
downstreamServer
.
URL
)
simpleStorage
:=
&
SimpleRESTStorage
{
simpleStorage
:=
&
SimpleRESTStorage
{
...
@@ -310,7 +313,8 @@ func TestProxy(t *testing.T) {
...
@@ -310,7 +313,8 @@ func TestProxy(t *testing.T) {
namespaceHandler
:=
handleNamespaced
(
map
[
string
]
rest
.
Storage
{
"foo"
:
simpleStorage
})
namespaceHandler
:=
handleNamespaced
(
map
[
string
]
rest
.
Storage
{
"foo"
:
simpleStorage
})
namespaceServer
:=
httptest
.
NewServer
(
namespaceHandler
)
namespaceServer
:=
httptest
.
NewServer
(
namespaceHandler
)
defer
namespaceServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer namespaceServer.Close()
// test each supported URL pattern for finding the redirection resource in the proxy in a particular namespace
// test each supported URL pattern for finding the redirection resource in the proxy in a particular namespace
serverPatterns
:=
[]
struct
{
serverPatterns
:=
[]
struct
{
...
@@ -419,7 +423,8 @@ func TestProxyUpgrade(t *testing.T) {
...
@@ -419,7 +423,8 @@ func TestProxyUpgrade(t *testing.T) {
ws
.
Read
(
body
)
ws
.
Read
(
body
)
ws
.
Write
([]
byte
(
"hello "
+
string
(
body
)))
ws
.
Write
([]
byte
(
"hello "
+
string
(
body
)))
}))
}))
defer
backendServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer backendServer.Close()
serverURL
,
_
:=
url
.
Parse
(
backendServer
.
URL
)
serverURL
,
_
:=
url
.
Parse
(
backendServer
.
URL
)
simpleStorage
:=
&
SimpleRESTStorage
{
simpleStorage
:=
&
SimpleRESTStorage
{
...
@@ -432,7 +437,8 @@ func TestProxyUpgrade(t *testing.T) {
...
@@ -432,7 +437,8 @@ func TestProxyUpgrade(t *testing.T) {
namespaceHandler
:=
handleNamespaced
(
map
[
string
]
rest
.
Storage
{
"foo"
:
simpleStorage
})
namespaceHandler
:=
handleNamespaced
(
map
[
string
]
rest
.
Storage
{
"foo"
:
simpleStorage
})
server
:=
httptest
.
NewServer
(
namespaceHandler
)
server
:=
httptest
.
NewServer
(
namespaceHandler
)
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
ws
,
err
:=
websocket
.
Dial
(
"ws://"
+
server
.
Listener
.
Addr
()
.
String
()
+
"/"
+
prefix
+
"/"
+
newGroupVersion
.
Group
+
"/"
+
newGroupVersion
.
Version
+
"/proxy/namespaces/myns/foo/123"
,
""
,
"http://127.0.0.1/"
)
ws
,
err
:=
websocket
.
Dial
(
"ws://"
+
server
.
Listener
.
Addr
()
.
String
()
+
"/"
+
prefix
+
"/"
+
newGroupVersion
.
Group
+
"/"
+
newGroupVersion
.
Version
+
"/proxy/namespaces/myns/foo/123"
,
""
,
"http://127.0.0.1/"
)
if
err
!=
nil
{
if
err
!=
nil
{
...
@@ -485,7 +491,8 @@ func TestRedirectOnMissingTrailingSlash(t *testing.T) {
...
@@ -485,7 +491,8 @@ func TestRedirectOnMissingTrailingSlash(t *testing.T) {
t
.
Errorf
(
"Unexpected query on url: %s, expected: %s"
,
req
.
URL
.
RawQuery
,
item
.
query
)
t
.
Errorf
(
"Unexpected query on url: %s, expected: %s"
,
req
.
URL
.
RawQuery
,
item
.
query
)
}
}
}))
}))
defer
downstreamServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer downstreamServer.Close()
serverURL
,
_
:=
url
.
Parse
(
downstreamServer
.
URL
)
serverURL
,
_
:=
url
.
Parse
(
downstreamServer
.
URL
)
simpleStorage
:=
&
SimpleRESTStorage
{
simpleStorage
:=
&
SimpleRESTStorage
{
...
@@ -496,7 +503,8 @@ func TestRedirectOnMissingTrailingSlash(t *testing.T) {
...
@@ -496,7 +503,8 @@ func TestRedirectOnMissingTrailingSlash(t *testing.T) {
handler
:=
handleNamespaced
(
map
[
string
]
rest
.
Storage
{
"foo"
:
simpleStorage
})
handler
:=
handleNamespaced
(
map
[
string
]
rest
.
Storage
{
"foo"
:
simpleStorage
})
server
:=
httptest
.
NewServer
(
handler
)
server
:=
httptest
.
NewServer
(
handler
)
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
proxyTestPattern
:=
"/"
+
prefix
+
"/"
+
newGroupVersion
.
Group
+
"/"
+
newGroupVersion
.
Version
+
"/proxy/namespaces/ns/foo/id"
+
item
.
path
proxyTestPattern
:=
"/"
+
prefix
+
"/"
+
newGroupVersion
.
Group
+
"/"
+
newGroupVersion
.
Version
+
"/proxy/namespaces/ns/foo/id"
+
item
.
path
req
,
err
:=
http
.
NewRequest
(
req
,
err
:=
http
.
NewRequest
(
...
...
pkg/apiserver/watch_test.go
View file @
0df7e695
...
@@ -58,7 +58,8 @@ func TestWatchWebsocket(t *testing.T) {
...
@@ -58,7 +58,8 @@ func TestWatchWebsocket(t *testing.T) {
_
=
rest
.
Watcher
(
simpleStorage
)
// Give compile error if this doesn't work.
_
=
rest
.
Watcher
(
simpleStorage
)
// Give compile error if this doesn't work.
handler
:=
handle
(
map
[
string
]
rest
.
Storage
{
"simples"
:
simpleStorage
})
handler
:=
handle
(
map
[
string
]
rest
.
Storage
{
"simples"
:
simpleStorage
})
server
:=
httptest
.
NewServer
(
handler
)
server
:=
httptest
.
NewServer
(
handler
)
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
dest
,
_
:=
url
.
Parse
(
server
.
URL
)
dest
,
_
:=
url
.
Parse
(
server
.
URL
)
dest
.
Scheme
=
"ws"
// Required by websocket, though the server never sees it.
dest
.
Scheme
=
"ws"
// Required by websocket, though the server never sees it.
...
@@ -110,7 +111,8 @@ func TestWatchHTTP(t *testing.T) {
...
@@ -110,7 +111,8 @@ func TestWatchHTTP(t *testing.T) {
simpleStorage
:=
&
SimpleRESTStorage
{}
simpleStorage
:=
&
SimpleRESTStorage
{}
handler
:=
handle
(
map
[
string
]
rest
.
Storage
{
"simples"
:
simpleStorage
})
handler
:=
handle
(
map
[
string
]
rest
.
Storage
{
"simples"
:
simpleStorage
})
server
:=
httptest
.
NewServer
(
handler
)
server
:=
httptest
.
NewServer
(
handler
)
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
client
:=
http
.
Client
{}
client
:=
http
.
Client
{}
dest
,
_
:=
url
.
Parse
(
server
.
URL
)
dest
,
_
:=
url
.
Parse
(
server
.
URL
)
...
@@ -174,7 +176,8 @@ func TestWatchParamParsing(t *testing.T) {
...
@@ -174,7 +176,8 @@ func TestWatchParamParsing(t *testing.T) {
"simpleroots"
:
simpleStorage
,
"simpleroots"
:
simpleStorage
,
})
})
server
:=
httptest
.
NewServer
(
handler
)
server
:=
httptest
.
NewServer
(
handler
)
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
dest
,
_
:=
url
.
Parse
(
server
.
URL
)
dest
,
_
:=
url
.
Parse
(
server
.
URL
)
...
@@ -281,7 +284,8 @@ func TestWatchProtocolSelection(t *testing.T) {
...
@@ -281,7 +284,8 @@ func TestWatchProtocolSelection(t *testing.T) {
simpleStorage
:=
&
SimpleRESTStorage
{}
simpleStorage
:=
&
SimpleRESTStorage
{}
handler
:=
handle
(
map
[
string
]
rest
.
Storage
{
"simples"
:
simpleStorage
})
handler
:=
handle
(
map
[
string
]
rest
.
Storage
{
"simples"
:
simpleStorage
})
server
:=
httptest
.
NewServer
(
handler
)
server
:=
httptest
.
NewServer
(
handler
)
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
defer
server
.
CloseClientConnections
()
defer
server
.
CloseClientConnections
()
client
:=
http
.
Client
{}
client
:=
http
.
Client
{}
...
@@ -354,7 +358,8 @@ func TestWatchHTTPTimeout(t *testing.T) {
...
@@ -354,7 +358,8 @@ func TestWatchHTTPTimeout(t *testing.T) {
s
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
req
*
http
.
Request
)
{
s
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
req
*
http
.
Request
)
{
watchServer
.
ServeHTTP
(
w
,
req
)
watchServer
.
ServeHTTP
(
w
,
req
)
}))
}))
defer
s
.
Close
()
// TODO: Uncomment when fix #19254
// defer s.Close()
// Setup a client
// Setup a client
dest
,
_
:=
url
.
Parse
(
s
.
URL
)
dest
,
_
:=
url
.
Parse
(
s
.
URL
)
...
...
pkg/client/cache/listwatch_test.go
View file @
0df7e695
...
@@ -95,7 +95,8 @@ func TestListWatchesCanList(t *testing.T) {
...
@@ -95,7 +95,8 @@ func TestListWatchesCanList(t *testing.T) {
T
:
t
,
T
:
t
,
}
}
server
:=
httptest
.
NewServer
(
&
handler
)
server
:=
httptest
.
NewServer
(
&
handler
)
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
server
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
server
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
lw
:=
NewListWatchFromClient
(
client
,
item
.
resource
,
item
.
namespace
,
item
.
fieldSelector
)
lw
:=
NewListWatchFromClient
(
client
,
item
.
resource
,
item
.
namespace
,
item
.
fieldSelector
)
// This test merely tests that the correct request is made.
// This test merely tests that the correct request is made.
...
@@ -161,7 +162,8 @@ func TestListWatchesCanWatch(t *testing.T) {
...
@@ -161,7 +162,8 @@ func TestListWatchesCanWatch(t *testing.T) {
T
:
t
,
T
:
t
,
}
}
server
:=
httptest
.
NewServer
(
&
handler
)
server
:=
httptest
.
NewServer
(
&
handler
)
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
server
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
server
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
lw
:=
NewListWatchFromClient
(
client
,
item
.
resource
,
item
.
namespace
,
item
.
fieldSelector
)
lw
:=
NewListWatchFromClient
(
client
,
item
.
resource
,
item
.
namespace
,
item
.
fieldSelector
)
// This test merely tests that the correct request is made.
// This test merely tests that the correct request is made.
...
...
pkg/client/chaosclient/chaosclient_test.go
View file @
0df7e695
...
@@ -42,7 +42,8 @@ func TestChaos(t *testing.T) {
...
@@ -42,7 +42,8 @@ func TestChaos(t *testing.T) {
server
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
_
*
http
.
Request
)
{
server
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
_
*
http
.
Request
)
{
w
.
WriteHeader
(
http
.
StatusOK
)
w
.
WriteHeader
(
http
.
StatusOK
)
}))
}))
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
client
:=
http
.
Client
{
client
:=
http
.
Client
{
Transport
:
NewChaosRoundTripper
(
http
.
DefaultTransport
,
TestLogChaos
{
t
},
ErrSimulatedConnectionResetByPeer
),
Transport
:
NewChaosRoundTripper
(
http
.
DefaultTransport
,
TestLogChaos
{
t
},
ErrSimulatedConnectionResetByPeer
),
}
}
...
@@ -59,7 +60,8 @@ func TestPartialChaos(t *testing.T) {
...
@@ -59,7 +60,8 @@ func TestPartialChaos(t *testing.T) {
server
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
_
*
http
.
Request
)
{
server
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
_
*
http
.
Request
)
{
w
.
WriteHeader
(
http
.
StatusOK
)
w
.
WriteHeader
(
http
.
StatusOK
)
}))
}))
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
seed
:=
NewSeed
(
1
)
seed
:=
NewSeed
(
1
)
client
:=
http
.
Client
{
client
:=
http
.
Client
{
Transport
:
NewChaosRoundTripper
(
Transport
:
NewChaosRoundTripper
(
...
...
pkg/client/unversioned/client_test.go
View file @
0df7e695
...
@@ -46,7 +46,8 @@ func TestGetServerVersion(t *testing.T) {
...
@@ -46,7 +46,8 @@ func TestGetServerVersion(t *testing.T) {
w
.
WriteHeader
(
http
.
StatusOK
)
w
.
WriteHeader
(
http
.
StatusOK
)
w
.
Write
(
output
)
w
.
Write
(
output
)
}))
}))
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
client
:=
NewOrDie
(
&
Config
{
Host
:
server
.
URL
})
client
:=
NewOrDie
(
&
Config
{
Host
:
server
.
URL
})
got
,
err
:=
client
.
ServerVersion
()
got
,
err
:=
client
.
ServerVersion
()
...
@@ -81,7 +82,8 @@ func TestGetServerGroupsWithV1Server(t *testing.T) {
...
@@ -81,7 +82,8 @@ func TestGetServerGroupsWithV1Server(t *testing.T) {
w
.
WriteHeader
(
http
.
StatusOK
)
w
.
WriteHeader
(
http
.
StatusOK
)
w
.
Write
(
output
)
w
.
Write
(
output
)
}))
}))
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
client
:=
NewOrDie
(
&
Config
{
Host
:
server
.
URL
})
client
:=
NewOrDie
(
&
Config
{
Host
:
server
.
URL
})
// ServerGroups should not return an error even if server returns error at /api and /apis
// ServerGroups should not return an error even if server returns error at /api and /apis
apiGroupList
,
err
:=
client
.
Discovery
()
.
ServerGroups
()
apiGroupList
,
err
:=
client
.
Discovery
()
.
ServerGroups
()
...
@@ -117,7 +119,8 @@ func TestGetServerResourcesWithV1Server(t *testing.T) {
...
@@ -117,7 +119,8 @@ func TestGetServerResourcesWithV1Server(t *testing.T) {
w
.
WriteHeader
(
http
.
StatusOK
)
w
.
WriteHeader
(
http
.
StatusOK
)
w
.
Write
(
output
)
w
.
Write
(
output
)
}))
}))
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
client
:=
NewOrDie
(
&
Config
{
Host
:
server
.
URL
})
client
:=
NewOrDie
(
&
Config
{
Host
:
server
.
URL
})
// ServerResources should not return an error even if server returns error at /api/v1.
// ServerResources should not return an error even if server returns error at /api/v1.
resourceMap
,
err
:=
client
.
Discovery
()
.
ServerResources
()
resourceMap
,
err
:=
client
.
Discovery
()
.
ServerResources
()
...
@@ -209,7 +212,8 @@ func TestGetServerResources(t *testing.T) {
...
@@ -209,7 +212,8 @@ func TestGetServerResources(t *testing.T) {
w
.
WriteHeader
(
http
.
StatusOK
)
w
.
WriteHeader
(
http
.
StatusOK
)
w
.
Write
(
output
)
w
.
Write
(
output
)
}))
}))
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
client
:=
NewOrDie
(
&
Config
{
Host
:
server
.
URL
})
client
:=
NewOrDie
(
&
Config
{
Host
:
server
.
URL
})
for
_
,
test
:=
range
tests
{
for
_
,
test
:=
range
tests
{
got
,
err
:=
client
.
Discovery
()
.
ServerResourcesForGroupVersion
(
test
.
request
)
got
,
err
:=
client
.
Discovery
()
.
ServerResourcesForGroupVersion
(
test
.
request
)
...
@@ -270,7 +274,8 @@ func TestGetSwaggerSchema(t *testing.T) {
...
@@ -270,7 +274,8 @@ func TestGetSwaggerSchema(t *testing.T) {
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Errorf
(
"unexpected encoding error: %v"
,
err
)
t
.
Errorf
(
"unexpected encoding error: %v"
,
err
)
}
}
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
client
:=
NewOrDie
(
&
Config
{
Host
:
server
.
URL
})
client
:=
NewOrDie
(
&
Config
{
Host
:
server
.
URL
})
got
,
err
:=
client
.
SwaggerSchema
(
v1
.
SchemeGroupVersion
)
got
,
err
:=
client
.
SwaggerSchema
(
v1
.
SchemeGroupVersion
)
...
@@ -289,7 +294,8 @@ func TestGetSwaggerSchemaFail(t *testing.T) {
...
@@ -289,7 +294,8 @@ func TestGetSwaggerSchemaFail(t *testing.T) {
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Errorf
(
"unexpected encoding error: %v"
,
err
)
t
.
Errorf
(
"unexpected encoding error: %v"
,
err
)
}
}
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
client
:=
NewOrDie
(
&
Config
{
Host
:
server
.
URL
})
client
:=
NewOrDie
(
&
Config
{
Host
:
server
.
URL
})
got
,
err
:=
client
.
SwaggerSchema
(
unversioned
.
GroupVersion
{
Group
:
"api.group"
,
Version
:
"v4"
})
got
,
err
:=
client
.
SwaggerSchema
(
unversioned
.
GroupVersion
{
Group
:
"api.group"
,
Version
:
"v4"
})
...
...
pkg/client/unversioned/containerinfo_test.go
View file @
0df7e695
...
@@ -70,7 +70,8 @@ func testHTTPContainerInfoGetter(
...
@@ -70,7 +70,8 @@ func testHTTPContainerInfoGetter(
t
.
Fatal
(
err
)
t
.
Fatal
(
err
)
}
}
}))
}))
defer
ts
.
Close
()
// TODO: Uncomment when fix #19254
// defer ts.Close()
hostURL
,
err
:=
url
.
Parse
(
ts
.
URL
)
hostURL
,
err
:=
url
.
Parse
(
ts
.
URL
)
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatal
(
err
)
t
.
Fatal
(
err
)
...
@@ -171,7 +172,8 @@ func TestHTTPGetMachineInfo(t *testing.T) {
...
@@ -171,7 +172,8 @@ func TestHTTPGetMachineInfo(t *testing.T) {
t
.
Fatal
(
err
)
t
.
Fatal
(
err
)
}
}
}))
}))
defer
ts
.
Close
()
// TODO: Uncomment when fix #19254
// defer ts.Close()
hostURL
,
err
:=
url
.
Parse
(
ts
.
URL
)
hostURL
,
err
:=
url
.
Parse
(
ts
.
URL
)
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatal
(
err
)
t
.
Fatal
(
err
)
...
...
pkg/client/unversioned/helper_test.go
View file @
0df7e695
...
@@ -185,7 +185,8 @@ func TestHelperGetServerAPIVersions(t *testing.T) {
...
@@ -185,7 +185,8 @@ func TestHelperGetServerAPIVersions(t *testing.T) {
w
.
WriteHeader
(
http
.
StatusOK
)
w
.
WriteHeader
(
http
.
StatusOK
)
w
.
Write
(
output
)
w
.
Write
(
output
)
}))
}))
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
got
,
err
:=
ServerAPIVersions
(
&
Config
{
Host
:
server
.
URL
,
GroupVersion
:
&
unversioned
.
GroupVersion
{
Group
:
"invalid version"
,
Version
:
"one"
},
Codec
:
testapi
.
Default
.
Codec
()})
got
,
err
:=
ServerAPIVersions
(
&
Config
{
Host
:
server
.
URL
,
GroupVersion
:
&
unversioned
.
GroupVersion
{
Group
:
"invalid version"
,
Version
:
"one"
},
Codec
:
testapi
.
Default
.
Codec
()})
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Fatalf
(
"unexpected encoding error: %v"
,
err
)
t
.
Fatalf
(
"unexpected encoding error: %v"
,
err
)
...
...
pkg/client/unversioned/portforward/portforward_test.go
View file @
0df7e695
...
@@ -320,7 +320,8 @@ func TestForwardPorts(t *testing.T) {
...
@@ -320,7 +320,8 @@ func TestForwardPorts(t *testing.T) {
clientConn
,
err
:=
net
.
Dial
(
"tcp"
,
fmt
.
Sprintf
(
"localhost:%d"
,
port
))
clientConn
,
err
:=
net
.
Dial
(
"tcp"
,
fmt
.
Sprintf
(
"localhost:%d"
,
port
))
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Errorf
(
"%s: error dialing %d: %s"
,
testName
,
port
,
err
)
t
.
Errorf
(
"%s: error dialing %d: %s"
,
testName
,
port
,
err
)
server
.
Close
()
// TODO: Uncomment when fix #19254
// server.Close()
continue
continue
}
}
defer
clientConn
.
Close
()
defer
clientConn
.
Close
()
...
@@ -328,24 +329,28 @@ func TestForwardPorts(t *testing.T) {
...
@@ -328,24 +329,28 @@ func TestForwardPorts(t *testing.T) {
n
,
err
:=
clientConn
.
Write
([]
byte
(
data
))
n
,
err
:=
clientConn
.
Write
([]
byte
(
data
))
if
err
!=
nil
&&
err
!=
io
.
EOF
{
if
err
!=
nil
&&
err
!=
io
.
EOF
{
t
.
Errorf
(
"%s: Error sending data '%s': %s"
,
testName
,
data
,
err
)
t
.
Errorf
(
"%s: Error sending data '%s': %s"
,
testName
,
data
,
err
)
server
.
Close
()
// TODO: Uncomment when fix #19254
// server.Close()
continue
continue
}
}
if
n
==
0
{
if
n
==
0
{
t
.
Errorf
(
"%s: unexpected write of 0 bytes"
,
testName
)
t
.
Errorf
(
"%s: unexpected write of 0 bytes"
,
testName
)
server
.
Close
()
// TODO: Uncomment when fix #19254
// server.Close()
continue
continue
}
}
b
:=
make
([]
byte
,
4
)
b
:=
make
([]
byte
,
4
)
n
,
err
=
clientConn
.
Read
(
b
)
n
,
err
=
clientConn
.
Read
(
b
)
if
err
!=
nil
&&
err
!=
io
.
EOF
{
if
err
!=
nil
&&
err
!=
io
.
EOF
{
t
.
Errorf
(
"%s: Error reading data: %s"
,
testName
,
err
)
t
.
Errorf
(
"%s: Error reading data: %s"
,
testName
,
err
)
server
.
Close
()
// TODO: Uncomment when fix #19254
// server.Close()
continue
continue
}
}
if
!
bytes
.
Equal
([]
byte
(
test
.
serverSends
[
port
]),
b
)
{
if
!
bytes
.
Equal
([]
byte
(
test
.
serverSends
[
port
]),
b
)
{
t
.
Errorf
(
"%s: expected to read '%s', got '%s'"
,
testName
,
test
.
serverSends
[
port
],
b
)
t
.
Errorf
(
"%s: expected to read '%s', got '%s'"
,
testName
,
test
.
serverSends
[
port
],
b
)
server
.
Close
()
// TODO: Uncomment when fix #19254
// server.Close()
continue
continue
}
}
}
}
...
@@ -357,14 +362,16 @@ func TestForwardPorts(t *testing.T) {
...
@@ -357,14 +362,16 @@ func TestForwardPorts(t *testing.T) {
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Errorf
(
"%s: unexpected error: %s"
,
testName
,
err
)
t
.
Errorf
(
"%s: unexpected error: %s"
,
testName
,
err
)
}
}
server
.
Close
()
// TODO: Uncomment when fix #19254
// server.Close()
}
}
}
}
func
TestForwardPortsReturnsErrorWhenAllBindsFailed
(
t
*
testing
.
T
)
{
func
TestForwardPortsReturnsErrorWhenAllBindsFailed
(
t
*
testing
.
T
)
{
server
:=
httptest
.
NewServer
(
fakePortForwardServer
(
t
,
"allBindsFailed"
,
nil
,
nil
))
server
:=
httptest
.
NewServer
(
fakePortForwardServer
(
t
,
"allBindsFailed"
,
nil
,
nil
))
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
url
,
_
:=
url
.
Parse
(
server
.
URL
)
url
,
_
:=
url
.
Parse
(
server
.
URL
)
exec
,
err
:=
remotecommand
.
NewExecutor
(
&
client
.
Config
{},
"POST"
,
url
)
exec
,
err
:=
remotecommand
.
NewExecutor
(
&
client
.
Config
{},
"POST"
,
url
)
...
...
pkg/client/unversioned/remotecommand/remotecommand_test.go
View file @
0df7e695
...
@@ -215,13 +215,15 @@ func TestRequestExecuteRemoteCommand(t *testing.T) {
...
@@ -215,13 +215,15 @@ func TestRequestExecuteRemoteCommand(t *testing.T) {
}
}
}
}
server
.
Close
()
// TODO: Uncomment when fix #19254
// server.Close()
continue
continue
}
}
if
hasErr
{
if
hasErr
{
t
.
Errorf
(
"%d: unexpected error: %v"
,
i
,
err
)
t
.
Errorf
(
"%d: unexpected error: %v"
,
i
,
err
)
server
.
Close
()
// TODO: Uncomment when fix #19254
// server.Close()
continue
continue
}
}
...
@@ -237,7 +239,8 @@ func TestRequestExecuteRemoteCommand(t *testing.T) {
...
@@ -237,7 +239,8 @@ func TestRequestExecuteRemoteCommand(t *testing.T) {
}
}
}
}
server
.
Close
()
// TODO: Uncomment when fix #19254
// server.Close()
}
}
}
}
...
@@ -295,13 +298,15 @@ func TestRequestAttachRemoteCommand(t *testing.T) {
...
@@ -295,13 +298,15 @@ func TestRequestAttachRemoteCommand(t *testing.T) {
}
}
}
}
server
.
Close
()
// TODO: Uncomment when fix #19254
// server.Close()
continue
continue
}
}
if
hasErr
{
if
hasErr
{
t
.
Errorf
(
"%d: unexpected error: %v"
,
i
,
err
)
t
.
Errorf
(
"%d: unexpected error: %v"
,
i
,
err
)
server
.
Close
()
// TODO: Uncomment when fix #19254
// server.Close()
continue
continue
}
}
...
@@ -317,7 +322,8 @@ func TestRequestAttachRemoteCommand(t *testing.T) {
...
@@ -317,7 +322,8 @@ func TestRequestAttachRemoteCommand(t *testing.T) {
}
}
}
}
server
.
Close
()
// TODO: Uncomment when fix #19254
// server.Close()
}
}
}
}
...
...
pkg/client/unversioned/request_test.go
View file @
0df7e695
...
@@ -704,7 +704,8 @@ func TestDoRequestNewWay(t *testing.T) {
...
@@ -704,7 +704,8 @@ func TestDoRequestNewWay(t *testing.T) {
T
:
t
,
T
:
t
,
}
}
testServer
:=
httptest
.
NewServer
(
&
fakeHandler
)
testServer
:=
httptest
.
NewServer
(
&
fakeHandler
)
defer
testServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer testServer.Close()
c
:=
testRESTClient
(
t
,
testServer
)
c
:=
testRESTClient
(
t
,
testServer
)
obj
,
err
:=
c
.
Verb
(
"POST"
)
.
obj
,
err
:=
c
.
Verb
(
"POST"
)
.
Prefix
(
"foo"
,
"bar"
)
.
Prefix
(
"foo"
,
"bar"
)
.
...
@@ -740,7 +741,8 @@ func TestBackoffLifecycle(t *testing.T) {
...
@@ -740,7 +741,8 @@ func TestBackoffLifecycle(t *testing.T) {
return
return
}
}
}))
}))
defer
testServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer testServer.Close()
c
:=
testRESTClient
(
t
,
testServer
)
c
:=
testRESTClient
(
t
,
testServer
)
// Test backoff recovery and increase. This correlates to the constants
// Test backoff recovery and increase. This correlates to the constants
...
@@ -776,7 +778,8 @@ func TestCheckRetryClosesBody(t *testing.T) {
...
@@ -776,7 +778,8 @@ func TestCheckRetryClosesBody(t *testing.T) {
w
.
Header
()
.
Set
(
"Retry-After"
,
"0"
)
w
.
Header
()
.
Set
(
"Retry-After"
,
"0"
)
w
.
WriteHeader
(
apierrors
.
StatusTooManyRequests
)
w
.
WriteHeader
(
apierrors
.
StatusTooManyRequests
)
}))
}))
defer
testServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer testServer.Close()
c
:=
testRESTClient
(
t
,
testServer
)
c
:=
testRESTClient
(
t
,
testServer
)
_
,
err
:=
c
.
Verb
(
"POST"
)
.
_
,
err
:=
c
.
Verb
(
"POST"
)
.
...
@@ -808,7 +811,8 @@ func TestCheckRetryHandles429And5xx(t *testing.T) {
...
@@ -808,7 +811,8 @@ func TestCheckRetryHandles429And5xx(t *testing.T) {
w
.
WriteHeader
([]
int
{
apierrors
.
StatusTooManyRequests
,
500
,
501
,
504
}[
count
])
w
.
WriteHeader
([]
int
{
apierrors
.
StatusTooManyRequests
,
500
,
501
,
504
}[
count
])
count
++
count
++
}))
}))
defer
testServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer testServer.Close()
c
:=
testRESTClient
(
t
,
testServer
)
c
:=
testRESTClient
(
t
,
testServer
)
_
,
err
:=
c
.
Verb
(
"POST"
)
.
_
,
err
:=
c
.
Verb
(
"POST"
)
.
...
@@ -837,7 +841,8 @@ func BenchmarkCheckRetryClosesBody(b *testing.B) {
...
@@ -837,7 +841,8 @@ func BenchmarkCheckRetryClosesBody(b *testing.B) {
w
.
Header
()
.
Set
(
"Retry-After"
,
"0"
)
w
.
Header
()
.
Set
(
"Retry-After"
,
"0"
)
w
.
WriteHeader
(
apierrors
.
StatusTooManyRequests
)
w
.
WriteHeader
(
apierrors
.
StatusTooManyRequests
)
}))
}))
defer
testServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer testServer.Close()
c
:=
testRESTClient
(
b
,
testServer
)
c
:=
testRESTClient
(
b
,
testServer
)
r
:=
c
.
Verb
(
"POST"
)
.
r
:=
c
.
Verb
(
"POST"
)
.
...
@@ -868,7 +873,8 @@ func TestDoRequestNewWayReader(t *testing.T) {
...
@@ -868,7 +873,8 @@ func TestDoRequestNewWayReader(t *testing.T) {
T
:
t
,
T
:
t
,
}
}
testServer
:=
httptest
.
NewServer
(
&
fakeHandler
)
testServer
:=
httptest
.
NewServer
(
&
fakeHandler
)
defer
testServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer testServer.Close()
c
:=
testRESTClient
(
t
,
testServer
)
c
:=
testRESTClient
(
t
,
testServer
)
obj
,
err
:=
c
.
Verb
(
"POST"
)
.
obj
,
err
:=
c
.
Verb
(
"POST"
)
.
Resource
(
"bar"
)
.
Resource
(
"bar"
)
.
...
@@ -908,7 +914,8 @@ func TestDoRequestNewWayObj(t *testing.T) {
...
@@ -908,7 +914,8 @@ func TestDoRequestNewWayObj(t *testing.T) {
T
:
t
,
T
:
t
,
}
}
testServer
:=
httptest
.
NewServer
(
&
fakeHandler
)
testServer
:=
httptest
.
NewServer
(
&
fakeHandler
)
defer
testServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer testServer.Close()
c
:=
testRESTClient
(
t
,
testServer
)
c
:=
testRESTClient
(
t
,
testServer
)
obj
,
err
:=
c
.
Verb
(
"POST"
)
.
obj
,
err
:=
c
.
Verb
(
"POST"
)
.
Suffix
(
"baz"
)
.
Suffix
(
"baz"
)
.
...
@@ -963,7 +970,8 @@ func TestDoRequestNewWayFile(t *testing.T) {
...
@@ -963,7 +970,8 @@ func TestDoRequestNewWayFile(t *testing.T) {
T
:
t
,
T
:
t
,
}
}
testServer
:=
httptest
.
NewServer
(
&
fakeHandler
)
testServer
:=
httptest
.
NewServer
(
&
fakeHandler
)
defer
testServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer testServer.Close()
c
:=
testRESTClient
(
t
,
testServer
)
c
:=
testRESTClient
(
t
,
testServer
)
wasCreated
:=
true
wasCreated
:=
true
obj
,
err
:=
c
.
Verb
(
"POST"
)
.
obj
,
err
:=
c
.
Verb
(
"POST"
)
.
...
@@ -1008,7 +1016,8 @@ func TestWasCreated(t *testing.T) {
...
@@ -1008,7 +1016,8 @@ func TestWasCreated(t *testing.T) {
T
:
t
,
T
:
t
,
}
}
testServer
:=
httptest
.
NewServer
(
&
fakeHandler
)
testServer
:=
httptest
.
NewServer
(
&
fakeHandler
)
defer
testServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer testServer.Close()
c
:=
testRESTClient
(
t
,
testServer
)
c
:=
testRESTClient
(
t
,
testServer
)
wasCreated
:=
false
wasCreated
:=
false
obj
,
err
:=
c
.
Verb
(
"PUT"
)
.
obj
,
err
:=
c
.
Verb
(
"PUT"
)
.
...
@@ -1177,7 +1186,8 @@ func TestWatch(t *testing.T) {
...
@@ -1177,7 +1186,8 @@ func TestWatch(t *testing.T) {
flusher
.
Flush
()
flusher
.
Flush
()
}
}
}))
}))
defer
testServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer testServer.Close()
s
:=
testRESTClient
(
t
,
testServer
)
s
:=
testRESTClient
(
t
,
testServer
)
watching
,
err
:=
s
.
Get
()
.
Prefix
(
"path/to/watch/thing"
)
.
Watch
()
watching
,
err
:=
s
.
Get
()
.
Prefix
(
"path/to/watch/thing"
)
.
Watch
()
...
@@ -1217,7 +1227,8 @@ func TestStream(t *testing.T) {
...
@@ -1217,7 +1227,8 @@ func TestStream(t *testing.T) {
w
.
Write
([]
byte
(
expectedBody
))
w
.
Write
([]
byte
(
expectedBody
))
flusher
.
Flush
()
flusher
.
Flush
()
}))
}))
defer
testServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer testServer.Close()
s
:=
testRESTClient
(
t
,
testServer
)
s
:=
testRESTClient
(
t
,
testServer
)
readCloser
,
err
:=
s
.
Get
()
.
Prefix
(
"path/to/stream/thing"
)
.
Stream
()
readCloser
,
err
:=
s
.
Get
()
.
Prefix
(
"path/to/stream/thing"
)
.
Stream
()
...
...
pkg/client/unversioned/restclient_test.go
View file @
0df7e695
...
@@ -40,7 +40,8 @@ func TestDoRequestSuccess(t *testing.T) {
...
@@ -40,7 +40,8 @@ func TestDoRequestSuccess(t *testing.T) {
T
:
t
,
T
:
t
,
}
}
testServer
:=
httptest
.
NewServer
(
&
fakeHandler
)
testServer
:=
httptest
.
NewServer
(
&
fakeHandler
)
defer
testServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer testServer.Close()
c
,
err
:=
RESTClientFor
(
&
Config
{
c
,
err
:=
RESTClientFor
(
&
Config
{
Host
:
testServer
.
URL
,
Host
:
testServer
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
(),
GroupVersion
:
testapi
.
Default
.
GroupVersion
(),
...
@@ -83,7 +84,8 @@ func TestDoRequestFailed(t *testing.T) {
...
@@ -83,7 +84,8 @@ func TestDoRequestFailed(t *testing.T) {
T
:
t
,
T
:
t
,
}
}
testServer
:=
httptest
.
NewServer
(
&
fakeHandler
)
testServer
:=
httptest
.
NewServer
(
&
fakeHandler
)
defer
testServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer testServer.Close()
c
,
err
:=
RESTClientFor
(
&
Config
{
c
,
err
:=
RESTClientFor
(
&
Config
{
Host
:
testServer
.
URL
,
Host
:
testServer
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
(),
GroupVersion
:
testapi
.
Default
.
GroupVersion
(),
...
@@ -115,7 +117,8 @@ func TestDoRequestCreated(t *testing.T) {
...
@@ -115,7 +117,8 @@ func TestDoRequestCreated(t *testing.T) {
T
:
t
,
T
:
t
,
}
}
testServer
:=
httptest
.
NewServer
(
&
fakeHandler
)
testServer
:=
httptest
.
NewServer
(
&
fakeHandler
)
defer
testServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer testServer.Close()
c
,
err
:=
RESTClientFor
(
&
Config
{
c
,
err
:=
RESTClientFor
(
&
Config
{
Host
:
testServer
.
URL
,
Host
:
testServer
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
(),
GroupVersion
:
testapi
.
Default
.
GroupVersion
(),
...
...
pkg/client/unversioned/testclient/simple/simple_testclient.go
View file @
0df7e695
...
@@ -93,7 +93,8 @@ func (c *Client) Setup(t *testing.T) *Client {
...
@@ -93,7 +93,8 @@ func (c *Client) Setup(t *testing.T) *Client {
func
(
c
*
Client
)
Close
()
{
func
(
c
*
Client
)
Close
()
{
if
c
.
server
!=
nil
{
if
c
.
server
!=
nil
{
c
.
server
.
Close
()
// TODO: Uncomment when fix #19254
// c.server.Close()
}
}
}
}
...
...
pkg/cloudprovider/providers/mesos/client_test.go
View file @
0df7e695
...
@@ -212,8 +212,11 @@ func Test_parseMesosState(t *testing.T) {
...
@@ -212,8 +212,11 @@ func Test_parseMesosState(t *testing.T) {
func
Test_listSlaves
(
t
*
testing
.
T
)
{
func
Test_listSlaves
(
t
*
testing
.
T
)
{
defer
log
.
Flush
()
defer
log
.
Flush
()
md
:=
FakeMasterDetector
{}
md
:=
FakeMasterDetector
{}
httpServer
,
httpClient
,
httpTransport
:=
makeHttpMocks
()
// TODO: Uncomment next two lines and remove third line when fix #19254
defer
httpServer
.
Close
()
// defer httpServer.Close()
// httpServer, httpClient, httpTransport := makeHttpMocks()
_
,
httpClient
,
httpTransport
:=
makeHttpMocks
()
cacheTTL
:=
500
*
time
.
Millisecond
cacheTTL
:=
500
*
time
.
Millisecond
mesosClient
,
err
:=
createMesosClient
(
md
,
httpClient
,
httpTransport
,
cacheTTL
)
mesosClient
,
err
:=
createMesosClient
(
md
,
httpClient
,
httpTransport
,
cacheTTL
)
...
@@ -250,8 +253,10 @@ func Test_listSlaves(t *testing.T) {
...
@@ -250,8 +253,10 @@ func Test_listSlaves(t *testing.T) {
func
Test_clusterName
(
t
*
testing
.
T
)
{
func
Test_clusterName
(
t
*
testing
.
T
)
{
defer
log
.
Flush
()
defer
log
.
Flush
()
md
:=
FakeMasterDetector
{}
md
:=
FakeMasterDetector
{}
httpServer
,
httpClient
,
httpTransport
:=
makeHttpMocks
()
// TODO: Uncomment next two lines and remove third line when fix #19254
defer
httpServer
.
Close
()
// defer httpServer.Close()
// httpServer, httpClient, httpTransport := makeHttpMocks()
_
,
httpClient
,
httpTransport
:=
makeHttpMocks
()
cacheTTL
:=
500
*
time
.
Millisecond
cacheTTL
:=
500
*
time
.
Millisecond
mesosClient
,
err
:=
createMesosClient
(
md
,
httpClient
,
httpTransport
,
cacheTTL
)
mesosClient
,
err
:=
createMesosClient
(
md
,
httpClient
,
httpTransport
,
cacheTTL
)
...
...
pkg/controller/controller_utils_test.go
View file @
0df7e695
...
@@ -189,7 +189,8 @@ func TestCreatePods(t *testing.T) {
...
@@ -189,7 +189,8 @@ func TestCreatePods(t *testing.T) {
ResponseBody
:
string
(
body
),
ResponseBody
:
string
(
body
),
}
}
testServer
:=
httptest
.
NewServer
(
&
fakeHandler
)
testServer
:=
httptest
.
NewServer
(
&
fakeHandler
)
defer
testServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer testServer.Close()
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
testServer
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
testServer
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
podControl
:=
RealPodControl
{
podControl
:=
RealPodControl
{
...
...
pkg/controller/endpoint/endpoints_controller_test.go
View file @
0df7e695
...
@@ -102,7 +102,8 @@ func TestSyncEndpointsItemsPreserveNoSelector(t *testing.T) {
...
@@ -102,7 +102,8 @@ func TestSyncEndpointsItemsPreserveNoSelector(t *testing.T) {
Ports
:
[]
api
.
EndpointPort
{{
Port
:
1000
}},
Ports
:
[]
api
.
EndpointPort
{{
Port
:
1000
}},
}},
}},
}})
}})
defer
testServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer testServer.Close()
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
testServer
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
testServer
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
endpoints
:=
NewEndpointController
(
client
,
controller
.
NoResyncPeriodFunc
)
endpoints
:=
NewEndpointController
(
client
,
controller
.
NoResyncPeriodFunc
)
endpoints
.
serviceStore
.
Store
.
Add
(
&
api
.
Service
{
endpoints
.
serviceStore
.
Store
.
Add
(
&
api
.
Service
{
...
@@ -134,7 +135,8 @@ func TestCheckLeftoverEndpoints(t *testing.T) {
...
@@ -134,7 +135,8 @@ func TestCheckLeftoverEndpoints(t *testing.T) {
}},
}},
}},
}},
}})
}})
defer
testServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer testServer.Close()
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
testServer
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
testServer
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
endpoints
:=
NewEndpointController
(
client
,
controller
.
NoResyncPeriodFunc
)
endpoints
:=
NewEndpointController
(
client
,
controller
.
NoResyncPeriodFunc
)
endpoints
.
checkLeftoverEndpoints
()
endpoints
.
checkLeftoverEndpoints
()
...
@@ -162,7 +164,8 @@ func TestSyncEndpointsProtocolTCP(t *testing.T) {
...
@@ -162,7 +164,8 @@ func TestSyncEndpointsProtocolTCP(t *testing.T) {
Ports
:
[]
api
.
EndpointPort
{{
Port
:
1000
,
Protocol
:
"TCP"
}},
Ports
:
[]
api
.
EndpointPort
{{
Port
:
1000
,
Protocol
:
"TCP"
}},
}},
}},
}})
}})
defer
testServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer testServer.Close()
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
testServer
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
testServer
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
endpoints
:=
NewEndpointController
(
client
,
controller
.
NoResyncPeriodFunc
)
endpoints
:=
NewEndpointController
(
client
,
controller
.
NoResyncPeriodFunc
)
endpoints
.
serviceStore
.
Store
.
Add
(
&
api
.
Service
{
endpoints
.
serviceStore
.
Store
.
Add
(
&
api
.
Service
{
...
@@ -190,7 +193,8 @@ func TestSyncEndpointsProtocolUDP(t *testing.T) {
...
@@ -190,7 +193,8 @@ func TestSyncEndpointsProtocolUDP(t *testing.T) {
Ports
:
[]
api
.
EndpointPort
{{
Port
:
1000
,
Protocol
:
"UDP"
}},
Ports
:
[]
api
.
EndpointPort
{{
Port
:
1000
,
Protocol
:
"UDP"
}},
}},
}},
}})
}})
defer
testServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer testServer.Close()
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
testServer
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
testServer
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
endpoints
:=
NewEndpointController
(
client
,
controller
.
NoResyncPeriodFunc
)
endpoints
:=
NewEndpointController
(
client
,
controller
.
NoResyncPeriodFunc
)
endpoints
.
serviceStore
.
Store
.
Add
(
&
api
.
Service
{
endpoints
.
serviceStore
.
Store
.
Add
(
&
api
.
Service
{
...
@@ -215,7 +219,8 @@ func TestSyncEndpointsItemsEmptySelectorSelectsAll(t *testing.T) {
...
@@ -215,7 +219,8 @@ func TestSyncEndpointsItemsEmptySelectorSelectsAll(t *testing.T) {
},
},
Subsets
:
[]
api
.
EndpointSubset
{},
Subsets
:
[]
api
.
EndpointSubset
{},
}})
}})
defer
testServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer testServer.Close()
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
testServer
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
testServer
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
endpoints
:=
NewEndpointController
(
client
,
controller
.
NoResyncPeriodFunc
)
endpoints
:=
NewEndpointController
(
client
,
controller
.
NoResyncPeriodFunc
)
addPods
(
endpoints
.
podStore
.
Store
,
ns
,
1
,
1
,
0
)
addPods
(
endpoints
.
podStore
.
Store
,
ns
,
1
,
1
,
0
)
...
@@ -252,7 +257,8 @@ func TestSyncEndpointsItemsEmptySelectorSelectsAllNotReady(t *testing.T) {
...
@@ -252,7 +257,8 @@ func TestSyncEndpointsItemsEmptySelectorSelectsAllNotReady(t *testing.T) {
},
},
Subsets
:
[]
api
.
EndpointSubset
{},
Subsets
:
[]
api
.
EndpointSubset
{},
}})
}})
defer
testServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer testServer.Close()
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
testServer
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
testServer
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
endpoints
:=
NewEndpointController
(
client
,
controller
.
NoResyncPeriodFunc
)
endpoints
:=
NewEndpointController
(
client
,
controller
.
NoResyncPeriodFunc
)
addPods
(
endpoints
.
podStore
.
Store
,
ns
,
0
,
1
,
1
)
addPods
(
endpoints
.
podStore
.
Store
,
ns
,
0
,
1
,
1
)
...
@@ -289,7 +295,8 @@ func TestSyncEndpointsItemsEmptySelectorSelectsAllMixed(t *testing.T) {
...
@@ -289,7 +295,8 @@ func TestSyncEndpointsItemsEmptySelectorSelectsAllMixed(t *testing.T) {
},
},
Subsets
:
[]
api
.
EndpointSubset
{},
Subsets
:
[]
api
.
EndpointSubset
{},
}})
}})
defer
testServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer testServer.Close()
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
testServer
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
testServer
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
endpoints
:=
NewEndpointController
(
client
,
controller
.
NoResyncPeriodFunc
)
endpoints
:=
NewEndpointController
(
client
,
controller
.
NoResyncPeriodFunc
)
addPods
(
endpoints
.
podStore
.
Store
,
ns
,
1
,
1
,
1
)
addPods
(
endpoints
.
podStore
.
Store
,
ns
,
1
,
1
,
1
)
...
@@ -330,7 +337,8 @@ func TestSyncEndpointsItemsPreexisting(t *testing.T) {
...
@@ -330,7 +337,8 @@ func TestSyncEndpointsItemsPreexisting(t *testing.T) {
Ports
:
[]
api
.
EndpointPort
{{
Port
:
1000
}},
Ports
:
[]
api
.
EndpointPort
{{
Port
:
1000
}},
}},
}},
}})
}})
defer
testServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer testServer.Close()
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
testServer
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
testServer
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
endpoints
:=
NewEndpointController
(
client
,
controller
.
NoResyncPeriodFunc
)
endpoints
:=
NewEndpointController
(
client
,
controller
.
NoResyncPeriodFunc
)
addPods
(
endpoints
.
podStore
.
Store
,
ns
,
1
,
1
,
0
)
addPods
(
endpoints
.
podStore
.
Store
,
ns
,
1
,
1
,
0
)
...
@@ -370,7 +378,8 @@ func TestSyncEndpointsItemsPreexistingIdentical(t *testing.T) {
...
@@ -370,7 +378,8 @@ func TestSyncEndpointsItemsPreexistingIdentical(t *testing.T) {
Ports
:
[]
api
.
EndpointPort
{{
Port
:
8080
,
Protocol
:
"TCP"
}},
Ports
:
[]
api
.
EndpointPort
{{
Port
:
8080
,
Protocol
:
"TCP"
}},
}},
}},
}})
}})
defer
testServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer testServer.Close()
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
testServer
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
testServer
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
endpoints
:=
NewEndpointController
(
client
,
controller
.
NoResyncPeriodFunc
)
endpoints
:=
NewEndpointController
(
client
,
controller
.
NoResyncPeriodFunc
)
addPods
(
endpoints
.
podStore
.
Store
,
api
.
NamespaceDefault
,
1
,
1
,
0
)
addPods
(
endpoints
.
podStore
.
Store
,
api
.
NamespaceDefault
,
1
,
1
,
0
)
...
@@ -389,7 +398,8 @@ func TestSyncEndpointsItems(t *testing.T) {
...
@@ -389,7 +398,8 @@ func TestSyncEndpointsItems(t *testing.T) {
ns
:=
"other"
ns
:=
"other"
testServer
,
endpointsHandler
:=
makeTestServer
(
t
,
ns
,
testServer
,
endpointsHandler
:=
makeTestServer
(
t
,
ns
,
serverResponse
{
http
.
StatusOK
,
&
api
.
Endpoints
{}})
serverResponse
{
http
.
StatusOK
,
&
api
.
Endpoints
{}})
defer
testServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer testServer.Close()
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
testServer
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
testServer
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
endpoints
:=
NewEndpointController
(
client
,
controller
.
NoResyncPeriodFunc
)
endpoints
:=
NewEndpointController
(
client
,
controller
.
NoResyncPeriodFunc
)
addPods
(
endpoints
.
podStore
.
Store
,
ns
,
3
,
2
,
0
)
addPods
(
endpoints
.
podStore
.
Store
,
ns
,
3
,
2
,
0
)
...
@@ -431,7 +441,8 @@ func TestSyncEndpointsItemsWithLabels(t *testing.T) {
...
@@ -431,7 +441,8 @@ func TestSyncEndpointsItemsWithLabels(t *testing.T) {
ns
:=
"other"
ns
:=
"other"
testServer
,
endpointsHandler
:=
makeTestServer
(
t
,
ns
,
testServer
,
endpointsHandler
:=
makeTestServer
(
t
,
ns
,
serverResponse
{
http
.
StatusOK
,
&
api
.
Endpoints
{}})
serverResponse
{
http
.
StatusOK
,
&
api
.
Endpoints
{}})
defer
testServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer testServer.Close()
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
testServer
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
testServer
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
endpoints
:=
NewEndpointController
(
client
,
controller
.
NoResyncPeriodFunc
)
endpoints
:=
NewEndpointController
(
client
,
controller
.
NoResyncPeriodFunc
)
addPods
(
endpoints
.
podStore
.
Store
,
ns
,
3
,
2
,
0
)
addPods
(
endpoints
.
podStore
.
Store
,
ns
,
3
,
2
,
0
)
...
@@ -491,7 +502,8 @@ func TestSyncEndpointsItemsPreexistingLabelsChange(t *testing.T) {
...
@@ -491,7 +502,8 @@ func TestSyncEndpointsItemsPreexistingLabelsChange(t *testing.T) {
Ports
:
[]
api
.
EndpointPort
{{
Port
:
1000
}},
Ports
:
[]
api
.
EndpointPort
{{
Port
:
1000
}},
}},
}},
}})
}})
defer
testServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer testServer.Close()
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
testServer
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
testServer
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
endpoints
:=
NewEndpointController
(
client
,
controller
.
NoResyncPeriodFunc
)
endpoints
:=
NewEndpointController
(
client
,
controller
.
NoResyncPeriodFunc
)
addPods
(
endpoints
.
podStore
.
Store
,
ns
,
1
,
1
,
0
)
addPods
(
endpoints
.
podStore
.
Store
,
ns
,
1
,
1
,
0
)
...
...
pkg/controller/replication/replication_controller_test.go
View file @
0df7e695
...
@@ -215,7 +215,8 @@ func TestStatusUpdatesWithoutReplicasChange(t *testing.T) {
...
@@ -215,7 +215,8 @@ func TestStatusUpdatesWithoutReplicasChange(t *testing.T) {
ResponseBody
:
""
,
ResponseBody
:
""
,
}
}
testServer
:=
httptest
.
NewServer
(
&
fakeHandler
)
testServer
:=
httptest
.
NewServer
(
&
fakeHandler
)
defer
testServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer testServer.Close()
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
testServer
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
testServer
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
manager
:=
NewReplicationManager
(
client
,
controller
.
NoResyncPeriodFunc
,
BurstReplicas
)
manager
:=
NewReplicationManager
(
client
,
controller
.
NoResyncPeriodFunc
,
BurstReplicas
)
manager
.
podStoreSynced
=
alwaysReady
manager
.
podStoreSynced
=
alwaysReady
...
@@ -256,7 +257,8 @@ func TestControllerUpdateReplicas(t *testing.T) {
...
@@ -256,7 +257,8 @@ func TestControllerUpdateReplicas(t *testing.T) {
ResponseBody
:
""
,
ResponseBody
:
""
,
}
}
testServer
:=
httptest
.
NewServer
(
&
fakeHandler
)
testServer
:=
httptest
.
NewServer
(
&
fakeHandler
)
defer
testServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer testServer.Close()
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
testServer
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
testServer
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
manager
:=
NewReplicationManager
(
client
,
controller
.
NoResyncPeriodFunc
,
BurstReplicas
)
manager
:=
NewReplicationManager
(
client
,
controller
.
NoResyncPeriodFunc
,
BurstReplicas
)
...
@@ -295,7 +297,8 @@ func TestSyncReplicationControllerDormancy(t *testing.T) {
...
@@ -295,7 +297,8 @@ func TestSyncReplicationControllerDormancy(t *testing.T) {
ResponseBody
:
""
,
ResponseBody
:
""
,
}
}
testServer
:=
httptest
.
NewServer
(
&
fakeHandler
)
testServer
:=
httptest
.
NewServer
(
&
fakeHandler
)
defer
testServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer testServer.Close()
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
testServer
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
testServer
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
fakePodControl
:=
controller
.
FakePodControl
{}
fakePodControl
:=
controller
.
FakePodControl
{}
...
@@ -554,7 +557,8 @@ func TestControllerUpdateRequeue(t *testing.T) {
...
@@ -554,7 +557,8 @@ func TestControllerUpdateRequeue(t *testing.T) {
ResponseBody
:
""
,
ResponseBody
:
""
,
}
}
testServer
:=
httptest
.
NewServer
(
&
fakeHandler
)
testServer
:=
httptest
.
NewServer
(
&
fakeHandler
)
defer
testServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer testServer.Close()
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
testServer
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
testServer
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
manager
:=
NewReplicationManager
(
client
,
controller
.
NoResyncPeriodFunc
,
BurstReplicas
)
manager
:=
NewReplicationManager
(
client
,
controller
.
NoResyncPeriodFunc
,
BurstReplicas
)
...
...
pkg/credentialprovider/gcp/jwt_test.go
View file @
0df7e695
...
@@ -77,7 +77,8 @@ func TestJwtProvider(t *testing.T) {
...
@@ -77,7 +77,8 @@ func TestJwtProvider(t *testing.T) {
"expires_in": 3600
"expires_in": 3600
}`
,
token
)))
}`
,
token
)))
}))
}))
defer
ts
.
Close
()
// TODO: Uncomment when fix #19254
// defer ts.Close()
file
,
err
:=
ioutil
.
TempFile
(
os
.
TempDir
(),
"temp"
)
file
,
err
:=
ioutil
.
TempFile
(
os
.
TempDir
(),
"temp"
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
pkg/credentialprovider/gcp/metadata_test.go
View file @
0df7e695
...
@@ -56,7 +56,8 @@ func TestDockerKeyringFromGoogleDockerConfigMetadata(t *testing.T) {
...
@@ -56,7 +56,8 @@ func TestDockerKeyringFromGoogleDockerConfigMetadata(t *testing.T) {
w
.
WriteHeader
(
http
.
StatusNotFound
)
w
.
WriteHeader
(
http
.
StatusNotFound
)
}
}
}))
}))
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
// Make a transport that reroutes all traffic to the example server
// Make a transport that reroutes all traffic to the example server
transport
:=
&
http
.
Transport
{
transport
:=
&
http
.
Transport
{
...
@@ -128,7 +129,8 @@ func TestDockerKeyringFromGoogleDockerConfigMetadataUrl(t *testing.T) {
...
@@ -128,7 +129,8 @@ func TestDockerKeyringFromGoogleDockerConfigMetadataUrl(t *testing.T) {
w
.
WriteHeader
(
http
.
StatusNotFound
)
w
.
WriteHeader
(
http
.
StatusNotFound
)
}
}
}))
}))
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
// Make a transport that reroutes all traffic to the example server
// Make a transport that reroutes all traffic to the example server
transport
:=
&
http
.
Transport
{
transport
:=
&
http
.
Transport
{
...
@@ -201,7 +203,8 @@ func TestContainerRegistryBasics(t *testing.T) {
...
@@ -201,7 +203,8 @@ func TestContainerRegistryBasics(t *testing.T) {
w
.
WriteHeader
(
http
.
StatusNotFound
)
w
.
WriteHeader
(
http
.
StatusNotFound
)
}
}
}))
}))
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
// Make a transport that reroutes all traffic to the example server
// Make a transport that reroutes all traffic to the example server
transport
:=
&
http
.
Transport
{
transport
:=
&
http
.
Transport
{
...
@@ -257,7 +260,8 @@ func TestContainerRegistryNoStorageScope(t *testing.T) {
...
@@ -257,7 +260,8 @@ func TestContainerRegistryNoStorageScope(t *testing.T) {
w
.
WriteHeader
(
http
.
StatusNotFound
)
w
.
WriteHeader
(
http
.
StatusNotFound
)
}
}
}))
}))
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
// Make a transport that reroutes all traffic to the example server
// Make a transport that reroutes all traffic to the example server
transport
:=
&
http
.
Transport
{
transport
:=
&
http
.
Transport
{
...
@@ -290,7 +294,8 @@ func TestComputePlatformScopeSubstitutesStorageScope(t *testing.T) {
...
@@ -290,7 +294,8 @@ func TestComputePlatformScopeSubstitutesStorageScope(t *testing.T) {
w
.
WriteHeader
(
http
.
StatusNotFound
)
w
.
WriteHeader
(
http
.
StatusNotFound
)
}
}
}))
}))
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
// Make a transport that reroutes all traffic to the example server
// Make a transport that reroutes all traffic to the example server
transport
:=
&
http
.
Transport
{
transport
:=
&
http
.
Transport
{
...
@@ -312,7 +317,8 @@ func TestAllProvidersNoMetadata(t *testing.T) {
...
@@ -312,7 +317,8 @@ func TestAllProvidersNoMetadata(t *testing.T) {
server
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
server
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
w
.
WriteHeader
(
http
.
StatusNotFound
)
w
.
WriteHeader
(
http
.
StatusNotFound
)
}))
}))
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
// Make a transport that reroutes all traffic to the example server
// Make a transport that reroutes all traffic to the example server
transport
:=
&
http
.
Transport
{
transport
:=
&
http
.
Transport
{
...
...
pkg/genericapiserver/genericapiserver_test.go
View file @
0df7e695
...
@@ -114,6 +114,7 @@ func TestInstallAPIGroups(t *testing.T) {
...
@@ -114,6 +114,7 @@ func TestInstallAPIGroups(t *testing.T) {
}
}
s
.
InstallAPIGroups
(
apiGroupsInfo
)
s
.
InstallAPIGroups
(
apiGroupsInfo
)
// TODO: Close() this server when fix #19254
server
:=
httptest
.
NewServer
(
s
.
HandlerContainer
.
ServeMux
)
server
:=
httptest
.
NewServer
(
s
.
HandlerContainer
.
ServeMux
)
validPaths
:=
[]
string
{
validPaths
:=
[]
string
{
// "/api"
// "/api"
...
...
pkg/kubectl/cmd/util/helpers_test.go
View file @
0df7e695
...
@@ -212,6 +212,7 @@ func (f *fileHandler) ServeHTTP(res http.ResponseWriter, req *http.Request) {
...
@@ -212,6 +212,7 @@ func (f *fileHandler) ServeHTTP(res http.ResponseWriter, req *http.Request) {
func
TestReadConfigData
(
t
*
testing
.
T
)
{
func
TestReadConfigData
(
t
*
testing
.
T
)
{
httpData
:=
[]
byte
{
1
,
2
,
3
,
4
,
5
,
6
,
7
,
8
,
9
,
10
}
httpData
:=
[]
byte
{
1
,
2
,
3
,
4
,
5
,
6
,
7
,
8
,
9
,
10
}
// TODO: Close() this server when fix #19254
server
:=
httptest
.
NewServer
(
&
fileHandler
{
data
:
httpData
})
server
:=
httptest
.
NewServer
(
&
fileHandler
{
data
:
httpData
})
fileData
:=
[]
byte
{
11
,
12
,
13
,
14
,
15
,
16
,
17
,
18
,
19
}
fileData
:=
[]
byte
{
11
,
12
,
13
,
14
,
15
,
16
,
17
,
18
,
19
}
...
...
pkg/kubectl/proxy_server_test.go
View file @
0df7e695
...
@@ -205,7 +205,8 @@ func TestFileServing(t *testing.T) {
...
@@ -205,7 +205,8 @@ func TestFileServing(t *testing.T) {
const
prefix
=
"/foo/"
const
prefix
=
"/foo/"
handler
:=
newFileHandler
(
prefix
,
dir
)
handler
:=
newFileHandler
(
prefix
,
dir
)
server
:=
httptest
.
NewServer
(
handler
)
server
:=
httptest
.
NewServer
(
handler
)
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
url
:=
server
.
URL
+
prefix
+
fname
url
:=
server
.
URL
+
prefix
+
fname
res
,
err
:=
http
.
Get
(
url
)
res
,
err
:=
http
.
Get
(
url
)
...
@@ -235,7 +236,8 @@ func TestAPIRequests(t *testing.T) {
...
@@ -235,7 +236,8 @@ func TestAPIRequests(t *testing.T) {
}
}
fmt
.
Fprintf
(
w
,
"%s %s %s"
,
r
.
Method
,
r
.
RequestURI
,
string
(
b
))
fmt
.
Fprintf
(
w
,
"%s %s %s"
,
r
.
Method
,
r
.
RequestURI
,
string
(
b
))
}))
}))
defer
ts
.
Close
()
// TODO: Uncomment when fix #19254
// defer ts.Close()
// httptest.NewServer should always generate a valid URL.
// httptest.NewServer should always generate a valid URL.
target
,
_
:=
url
.
Parse
(
ts
.
URL
)
target
,
_
:=
url
.
Parse
(
ts
.
URL
)
...
@@ -271,7 +273,8 @@ func TestPathHandling(t *testing.T) {
...
@@ -271,7 +273,8 @@ func TestPathHandling(t *testing.T) {
ts
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
ts
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
fmt
.
Fprint
(
w
,
r
.
URL
.
Path
)
fmt
.
Fprint
(
w
,
r
.
URL
.
Path
)
}))
}))
defer
ts
.
Close
()
// TODO: Uncomment when fix #19254
// defer ts.Close()
table
:=
[]
struct
{
table
:=
[]
struct
{
prefix
string
prefix
string
...
@@ -301,7 +304,8 @@ func TestPathHandling(t *testing.T) {
...
@@ -301,7 +304,8 @@ func TestPathHandling(t *testing.T) {
t
.
Fatalf
(
"%#v: %v"
,
item
,
err
)
t
.
Fatalf
(
"%#v: %v"
,
item
,
err
)
}
}
pts
:=
httptest
.
NewServer
(
p
.
handler
)
pts
:=
httptest
.
NewServer
(
p
.
handler
)
defer
pts
.
Close
()
// TODO: Uncomment when fix #19254
// defer pts.Close()
r
,
err
:=
http
.
Get
(
pts
.
URL
+
item
.
reqPath
)
r
,
err
:=
http
.
Get
(
pts
.
URL
+
item
.
reqPath
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
pkg/kubectl/resource/builder_test.go
View file @
0df7e695
...
@@ -280,7 +280,8 @@ func TestNamespaceOverride(t *testing.T) {
...
@@ -280,7 +280,8 @@ func TestNamespaceOverride(t *testing.T) {
w
.
WriteHeader
(
http
.
StatusOK
)
w
.
WriteHeader
(
http
.
StatusOK
)
w
.
Write
([]
byte
(
runtime
.
EncodeOrDie
(
testapi
.
Default
.
Codec
(),
&
api
.
Pod
{
ObjectMeta
:
api
.
ObjectMeta
{
Namespace
:
"foo"
,
Name
:
"test"
}})))
w
.
Write
([]
byte
(
runtime
.
EncodeOrDie
(
testapi
.
Default
.
Codec
(),
&
api
.
Pod
{
ObjectMeta
:
api
.
ObjectMeta
{
Namespace
:
"foo"
,
Name
:
"test"
}})))
}))
}))
defer
s
.
Close
()
// TODO: Uncomment when fix #19254
// defer s.Close()
b
:=
NewBuilder
(
testapi
.
Default
.
RESTMapper
(),
api
.
Scheme
,
fakeClient
())
.
b
:=
NewBuilder
(
testapi
.
Default
.
RESTMapper
(),
api
.
Scheme
,
fakeClient
())
.
FilenameParam
(
false
,
s
.
URL
)
.
FilenameParam
(
false
,
s
.
URL
)
.
...
@@ -310,7 +311,8 @@ func TestURLBuilder(t *testing.T) {
...
@@ -310,7 +311,8 @@ func TestURLBuilder(t *testing.T) {
w
.
WriteHeader
(
http
.
StatusOK
)
w
.
WriteHeader
(
http
.
StatusOK
)
w
.
Write
([]
byte
(
runtime
.
EncodeOrDie
(
testapi
.
Default
.
Codec
(),
&
api
.
Pod
{
ObjectMeta
:
api
.
ObjectMeta
{
Namespace
:
"foo"
,
Name
:
"test"
}})))
w
.
Write
([]
byte
(
runtime
.
EncodeOrDie
(
testapi
.
Default
.
Codec
(),
&
api
.
Pod
{
ObjectMeta
:
api
.
ObjectMeta
{
Namespace
:
"foo"
,
Name
:
"test"
}})))
}))
}))
defer
s
.
Close
()
// TODO: Uncomment when fix #19254
// defer s.Close()
b
:=
NewBuilder
(
testapi
.
Default
.
RESTMapper
(),
api
.
Scheme
,
fakeClient
())
.
b
:=
NewBuilder
(
testapi
.
Default
.
RESTMapper
(),
api
.
Scheme
,
fakeClient
())
.
FilenameParam
(
false
,
s
.
URL
)
.
FilenameParam
(
false
,
s
.
URL
)
.
...
@@ -334,7 +336,8 @@ func TestURLBuilderRequireNamespace(t *testing.T) {
...
@@ -334,7 +336,8 @@ func TestURLBuilderRequireNamespace(t *testing.T) {
w
.
WriteHeader
(
http
.
StatusOK
)
w
.
WriteHeader
(
http
.
StatusOK
)
w
.
Write
([]
byte
(
runtime
.
EncodeOrDie
(
testapi
.
Default
.
Codec
(),
&
api
.
Pod
{
ObjectMeta
:
api
.
ObjectMeta
{
Namespace
:
"foo"
,
Name
:
"test"
}})))
w
.
Write
([]
byte
(
runtime
.
EncodeOrDie
(
testapi
.
Default
.
Codec
(),
&
api
.
Pod
{
ObjectMeta
:
api
.
ObjectMeta
{
Namespace
:
"foo"
,
Name
:
"test"
}})))
}))
}))
defer
s
.
Close
()
// TODO: Uncomment when fix #19254
// defer s.Close()
b
:=
NewBuilder
(
testapi
.
Default
.
RESTMapper
(),
api
.
Scheme
,
fakeClient
())
.
b
:=
NewBuilder
(
testapi
.
Default
.
RESTMapper
(),
api
.
Scheme
,
fakeClient
())
.
FilenameParam
(
false
,
s
.
URL
)
.
FilenameParam
(
false
,
s
.
URL
)
.
...
...
pkg/kubelet/client/kubelet_client_test.go
View file @
0df7e695
...
@@ -39,7 +39,8 @@ func TestHTTPKubeletClient(t *testing.T) {
...
@@ -39,7 +39,8 @@ func TestHTTPKubeletClient(t *testing.T) {
ResponseBody
:
string
(
body
),
ResponseBody
:
string
(
body
),
}
}
testServer
:=
httptest
.
NewServer
(
&
fakeHandler
)
testServer
:=
httptest
.
NewServer
(
&
fakeHandler
)
defer
testServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer testServer.Close()
if
_
,
err
:=
url
.
Parse
(
testServer
.
URL
);
err
!=
nil
{
if
_
,
err
:=
url
.
Parse
(
testServer
.
URL
);
err
!=
nil
{
t
.
Errorf
(
"unexpected error: %v"
,
err
)
t
.
Errorf
(
"unexpected error: %v"
,
err
)
...
...
pkg/kubelet/config/http_test.go
View file @
0df7e695
...
@@ -111,7 +111,8 @@ func TestExtractInvalidPods(t *testing.T) {
...
@@ -111,7 +111,8 @@ func TestExtractInvalidPods(t *testing.T) {
ResponseBody
:
string
(
data
),
ResponseBody
:
string
(
data
),
}
}
testServer
:=
httptest
.
NewServer
(
&
fakeHandler
)
testServer
:=
httptest
.
NewServer
(
&
fakeHandler
)
defer
testServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer testServer.Close()
ch
:=
make
(
chan
interface
{},
1
)
ch
:=
make
(
chan
interface
{},
1
)
c
:=
sourceURL
{
testServer
.
URL
,
http
.
Header
{},
"localhost"
,
ch
,
nil
,
0
}
c
:=
sourceURL
{
testServer
.
URL
,
http
.
Header
{},
"localhost"
,
ch
,
nil
,
0
}
if
err
:=
c
.
extractFromURL
();
err
==
nil
{
if
err
:=
c
.
extractFromURL
();
err
==
nil
{
...
@@ -271,7 +272,8 @@ func TestExtractPodsFromHTTP(t *testing.T) {
...
@@ -271,7 +272,8 @@ func TestExtractPodsFromHTTP(t *testing.T) {
ResponseBody
:
string
(
data
),
ResponseBody
:
string
(
data
),
}
}
testServer
:=
httptest
.
NewServer
(
&
fakeHandler
)
testServer
:=
httptest
.
NewServer
(
&
fakeHandler
)
defer
testServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer testServer.Close()
ch
:=
make
(
chan
interface
{},
1
)
ch
:=
make
(
chan
interface
{},
1
)
c
:=
sourceURL
{
testServer
.
URL
,
http
.
Header
{},
hostname
,
ch
,
nil
,
0
}
c
:=
sourceURL
{
testServer
.
URL
,
http
.
Header
{},
hostname
,
ch
,
nil
,
0
}
if
err
:=
c
.
extractFromURL
();
err
!=
nil
{
if
err
:=
c
.
extractFromURL
();
err
!=
nil
{
...
@@ -316,7 +318,8 @@ func TestURLWithHeader(t *testing.T) {
...
@@ -316,7 +318,8 @@ func TestURLWithHeader(t *testing.T) {
ResponseBody
:
string
(
data
),
ResponseBody
:
string
(
data
),
}
}
testServer
:=
httptest
.
NewServer
(
&
fakeHandler
)
testServer
:=
httptest
.
NewServer
(
&
fakeHandler
)
defer
testServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer testServer.Close()
ch
:=
make
(
chan
interface
{},
1
)
ch
:=
make
(
chan
interface
{},
1
)
header
:=
make
(
http
.
Header
)
header
:=
make
(
http
.
Header
)
header
.
Set
(
"Metadata-Flavor"
,
"Google"
)
header
.
Set
(
"Metadata-Flavor"
,
"Google"
)
...
...
pkg/kubelet/server/server_test.go
View file @
0df7e695
...
@@ -180,6 +180,7 @@ func newServerTest() *serverTestFramework {
...
@@ -180,6 +180,7 @@ func newServerTest() *serverTestFramework {
}
}
server
:=
NewServer
(
fw
.
fakeKubelet
,
fw
.
fakeAuth
,
true
)
server
:=
NewServer
(
fw
.
fakeKubelet
,
fw
.
fakeAuth
,
true
)
fw
.
serverUnderTest
=
&
server
fw
.
serverUnderTest
=
&
server
// TODO: Close() this when fix #19254
fw
.
testHTTPServer
=
httptest
.
NewServer
(
fw
.
serverUnderTest
)
fw
.
testHTTPServer
=
httptest
.
NewServer
(
fw
.
serverUnderTest
)
return
fw
return
fw
}
}
...
...
pkg/master/master_test.go
View file @
0df7e695
...
@@ -400,7 +400,8 @@ func testInstallThirdPartyAPIListVersion(t *testing.T, version string) {
...
@@ -400,7 +400,8 @@ func testInstallThirdPartyAPIListVersion(t *testing.T, version string) {
for
_
,
test
:=
range
tests
{
for
_
,
test
:=
range
tests
{
func
()
{
func
()
{
master
,
etcdserver
,
server
,
assert
:=
initThirdParty
(
t
,
version
)
master
,
etcdserver
,
server
,
assert
:=
initThirdParty
(
t
,
version
)
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
defer
etcdserver
.
Terminate
(
t
)
defer
etcdserver
.
Terminate
(
t
)
if
test
.
items
!=
nil
{
if
test
.
items
!=
nil
{
...
@@ -509,7 +510,8 @@ func TestInstallThirdPartyAPIGet(t *testing.T) {
...
@@ -509,7 +510,8 @@ func TestInstallThirdPartyAPIGet(t *testing.T) {
func
testInstallThirdPartyAPIGetVersion
(
t
*
testing
.
T
,
version
string
)
{
func
testInstallThirdPartyAPIGetVersion
(
t
*
testing
.
T
,
version
string
)
{
master
,
etcdserver
,
server
,
assert
:=
initThirdParty
(
t
,
version
)
master
,
etcdserver
,
server
,
assert
:=
initThirdParty
(
t
,
version
)
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
defer
etcdserver
.
Terminate
(
t
)
defer
etcdserver
.
Terminate
(
t
)
expectedObj
:=
Foo
{
expectedObj
:=
Foo
{
...
@@ -556,7 +558,8 @@ func TestInstallThirdPartyAPIPost(t *testing.T) {
...
@@ -556,7 +558,8 @@ func TestInstallThirdPartyAPIPost(t *testing.T) {
func
testInstallThirdPartyAPIPostForVersion
(
t
*
testing
.
T
,
version
string
)
{
func
testInstallThirdPartyAPIPostForVersion
(
t
*
testing
.
T
,
version
string
)
{
master
,
etcdserver
,
server
,
assert
:=
initThirdParty
(
t
,
version
)
master
,
etcdserver
,
server
,
assert
:=
initThirdParty
(
t
,
version
)
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
defer
etcdserver
.
Terminate
(
t
)
defer
etcdserver
.
Terminate
(
t
)
inputObj
:=
Foo
{
inputObj
:=
Foo
{
...
@@ -621,7 +624,8 @@ func TestInstallThirdPartyAPIDelete(t *testing.T) {
...
@@ -621,7 +624,8 @@ func TestInstallThirdPartyAPIDelete(t *testing.T) {
func
testInstallThirdPartyAPIDeleteVersion
(
t
*
testing
.
T
,
version
string
)
{
func
testInstallThirdPartyAPIDeleteVersion
(
t
*
testing
.
T
,
version
string
)
{
master
,
etcdserver
,
server
,
assert
:=
initThirdParty
(
t
,
version
)
master
,
etcdserver
,
server
,
assert
:=
initThirdParty
(
t
,
version
)
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
defer
etcdserver
.
Terminate
(
t
)
defer
etcdserver
.
Terminate
(
t
)
expectedObj
:=
Foo
{
expectedObj
:=
Foo
{
...
@@ -698,7 +702,8 @@ func TestInstallThirdPartyResourceRemove(t *testing.T) {
...
@@ -698,7 +702,8 @@ func TestInstallThirdPartyResourceRemove(t *testing.T) {
func
testInstallThirdPartyResourceRemove
(
t
*
testing
.
T
,
version
string
)
{
func
testInstallThirdPartyResourceRemove
(
t
*
testing
.
T
,
version
string
)
{
master
,
etcdserver
,
server
,
assert
:=
initThirdParty
(
t
,
version
)
master
,
etcdserver
,
server
,
assert
:=
initThirdParty
(
t
,
version
)
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
defer
etcdserver
.
Terminate
(
t
)
defer
etcdserver
.
Terminate
(
t
)
expectedObj
:=
Foo
{
expectedObj
:=
Foo
{
...
...
pkg/probe/http/http_test.go
View file @
0df7e695
...
@@ -80,6 +80,7 @@ func TestHTTPProbeChecker(t *testing.T) {
...
@@ -80,6 +80,7 @@ func TestHTTPProbeChecker(t *testing.T) {
},
},
}
}
for
_
,
test
:=
range
testCases
{
for
_
,
test
:=
range
testCases
{
// TODO: Close() this when fix #19254
server
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
server
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
test
.
handler
(
w
)
test
.
handler
(
w
)
}))
}))
...
...
pkg/probe/tcp/tcp_test.go
View file @
0df7e695
...
@@ -42,7 +42,8 @@ func TestTcpHealthChecker(t *testing.T) {
...
@@ -42,7 +42,8 @@ func TestTcpHealthChecker(t *testing.T) {
server
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
server
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
w
.
WriteHeader
(
http
.
StatusOK
)
w
.
WriteHeader
(
http
.
StatusOK
)
}))
}))
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
tHost
,
tPortStr
,
err
:=
net
.
SplitHostPort
(
server
.
Listener
.
Addr
()
.
String
())
tHost
,
tPortStr
,
err
:=
net
.
SplitHostPort
(
server
.
Listener
.
Addr
()
.
String
())
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Errorf
(
"unexpected error: %v"
,
err
)
t
.
Errorf
(
"unexpected error: %v"
,
err
)
...
...
pkg/proxy/userspace/proxier_test.go
View file @
0df7e695
...
@@ -90,6 +90,7 @@ func init() {
...
@@ -90,6 +90,7 @@ func init() {
util
.
ReallyCrash
=
true
util
.
ReallyCrash
=
true
// TCP setup.
// TCP setup.
// TODO: Close() this when fix #19254
tcp
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
tcp
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
w
.
WriteHeader
(
http
.
StatusOK
)
w
.
WriteHeader
(
http
.
StatusOK
)
w
.
Write
([]
byte
(
r
.
URL
.
Path
[
1
:
]))
w
.
Write
([]
byte
(
r
.
URL
.
Path
[
1
:
]))
...
...
pkg/registry/generic/rest/proxy_test.go
View file @
0df7e695
...
@@ -207,7 +207,8 @@ func TestServeHTTP(t *testing.T) {
...
@@ -207,7 +207,8 @@ func TestServeHTTP(t *testing.T) {
responseHeader
:
backendResponseHeader
,
responseHeader
:
backendResponseHeader
,
}
}
backendServer
:=
httptest
.
NewServer
(
backendHandler
)
backendServer
:=
httptest
.
NewServer
(
backendHandler
)
defer
backendServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer backendServer.Close()
responder
:=
&
fakeResponder
{}
responder
:=
&
fakeResponder
{}
backendURL
,
_
:=
url
.
Parse
(
backendServer
.
URL
)
backendURL
,
_
:=
url
.
Parse
(
backendServer
.
URL
)
...
@@ -218,7 +219,8 @@ func TestServeHTTP(t *testing.T) {
...
@@ -218,7 +219,8 @@ func TestServeHTTP(t *testing.T) {
UpgradeRequired
:
test
.
upgradeRequired
,
UpgradeRequired
:
test
.
upgradeRequired
,
}
}
proxyServer
:=
httptest
.
NewServer
(
proxyHandler
)
proxyServer
:=
httptest
.
NewServer
(
proxyHandler
)
defer
proxyServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer proxyServer.Close()
proxyURL
,
_
:=
url
.
Parse
(
proxyServer
.
URL
)
proxyURL
,
_
:=
url
.
Parse
(
proxyServer
.
URL
)
proxyURL
.
Path
=
test
.
requestPath
proxyURL
.
Path
=
test
.
requestPath
paramValues
:=
url
.
Values
{}
paramValues
:=
url
.
Values
{}
...
@@ -374,7 +376,8 @@ func TestProxyUpgrade(t *testing.T) {
...
@@ -374,7 +376,8 @@ func TestProxyUpgrade(t *testing.T) {
ws
.
Read
(
body
)
ws
.
Read
(
body
)
ws
.
Write
([]
byte
(
"hello "
+
string
(
body
)))
ws
.
Write
([]
byte
(
"hello "
+
string
(
body
)))
}))
}))
defer
backendServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer backendServer.Close()
serverURL
,
_
:=
url
.
Parse
(
backendServer
.
URL
)
serverURL
,
_
:=
url
.
Parse
(
backendServer
.
URL
)
proxyHandler
:=
&
UpgradeAwareProxyHandler
{
proxyHandler
:=
&
UpgradeAwareProxyHandler
{
...
@@ -382,7 +385,8 @@ func TestProxyUpgrade(t *testing.T) {
...
@@ -382,7 +385,8 @@ func TestProxyUpgrade(t *testing.T) {
Transport
:
tc
.
ProxyTransport
,
Transport
:
tc
.
ProxyTransport
,
}
}
proxy
:=
httptest
.
NewServer
(
proxyHandler
)
proxy
:=
httptest
.
NewServer
(
proxyHandler
)
defer
proxy
.
Close
()
// TODO: Uncomment when fix #19254
// defer proxy.Close()
ws
,
err
:=
websocket
.
Dial
(
"ws://"
+
proxy
.
Listener
.
Addr
()
.
String
()
+
"/some/path"
,
""
,
"http://127.0.0.1/"
)
ws
,
err
:=
websocket
.
Dial
(
"ws://"
+
proxy
.
Listener
.
Addr
()
.
String
()
+
"/some/path"
,
""
,
"http://127.0.0.1/"
)
if
err
!=
nil
{
if
err
!=
nil
{
...
@@ -616,7 +620,8 @@ func TestProxyRequestContentLengthAndTransferEncoding(t *testing.T) {
...
@@ -616,7 +620,8 @@ func TestProxyRequestContentLengthAndTransferEncoding(t *testing.T) {
// Write successful response
// Write successful response
w
.
Write
([]
byte
(
successfulResponse
))
w
.
Write
([]
byte
(
successfulResponse
))
}))
}))
defer
downstreamServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer downstreamServer.Close()
responder
:=
&
fakeResponder
{}
responder
:=
&
fakeResponder
{}
backendURL
,
_
:=
url
.
Parse
(
downstreamServer
.
URL
)
backendURL
,
_
:=
url
.
Parse
(
downstreamServer
.
URL
)
...
@@ -626,7 +631,8 @@ func TestProxyRequestContentLengthAndTransferEncoding(t *testing.T) {
...
@@ -626,7 +631,8 @@ func TestProxyRequestContentLengthAndTransferEncoding(t *testing.T) {
UpgradeRequired
:
false
,
UpgradeRequired
:
false
,
}
}
proxyServer
:=
httptest
.
NewServer
(
proxyHandler
)
proxyServer
:=
httptest
.
NewServer
(
proxyHandler
)
defer
proxyServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer proxyServer.Close()
// Dial the proxy server
// Dial the proxy server
conn
,
err
:=
net
.
Dial
(
proxyServer
.
Listener
.
Addr
()
.
Network
(),
proxyServer
.
Listener
.
Addr
()
.
String
())
conn
,
err
:=
net
.
Dial
(
proxyServer
.
Listener
.
Addr
()
.
Network
(),
proxyServer
.
Listener
.
Addr
()
.
String
())
...
...
pkg/registry/generic/rest/streamer_test.go
View file @
0df7e695
...
@@ -36,7 +36,8 @@ func TestInputStreamReader(t *testing.T) {
...
@@ -36,7 +36,8 @@ func TestInputStreamReader(t *testing.T) {
s
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
req
*
http
.
Request
)
{
s
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
req
*
http
.
Request
)
{
w
.
Write
([]
byte
(
resultString
))
w
.
Write
([]
byte
(
resultString
))
}))
}))
defer
s
.
Close
()
// TODO: Uncomment when fix #19254
// defer s.Close()
u
,
err
:=
url
.
Parse
(
s
.
URL
)
u
,
err
:=
url
.
Parse
(
s
.
URL
)
if
err
!=
nil
{
if
err
!=
nil
{
t
.
Errorf
(
"Error parsing server URL: %v"
,
err
)
t
.
Errorf
(
"Error parsing server URL: %v"
,
err
)
...
...
pkg/storage/etcd/util/etcd_util_test.go
View file @
0df7e695
...
@@ -47,7 +47,8 @@ func TestGetEtcdVersion_ValidVersion(t *testing.T) {
...
@@ -47,7 +47,8 @@ func TestGetEtcdVersion_ValidVersion(t *testing.T) {
testServer
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
testServer
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
fmt
.
Fprint
(
w
,
validEtcdVersion
)
fmt
.
Fprint
(
w
,
validEtcdVersion
)
}))
}))
defer
testServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer testServer.Close()
var
version
string
var
version
string
var
err
error
var
err
error
...
@@ -62,7 +63,8 @@ func TestGetEtcdVersion_ErrorStatus(t *testing.T) {
...
@@ -62,7 +63,8 @@ func TestGetEtcdVersion_ErrorStatus(t *testing.T) {
testServer
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
testServer
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
w
.
WriteHeader
(
http
.
StatusServiceUnavailable
)
w
.
WriteHeader
(
http
.
StatusServiceUnavailable
)
}))
}))
defer
testServer
.
Close
()
// TODO: Uncomment when fix #19254
// defer testServer.Close()
_
,
err
:=
GetEtcdVersion
(
testServer
.
URL
)
_
,
err
:=
GetEtcdVersion
(
testServer
.
URL
)
assert
.
NotNil
(
t
,
err
)
assert
.
NotNil
(
t
,
err
)
...
...
pkg/util/fake_handler_test.go
View file @
0df7e695
...
@@ -26,7 +26,8 @@ import (
...
@@ -26,7 +26,8 @@ import (
func
TestFakeHandlerPath
(
t
*
testing
.
T
)
{
func
TestFakeHandlerPath
(
t
*
testing
.
T
)
{
handler
:=
FakeHandler
{}
handler
:=
FakeHandler
{}
server
:=
httptest
.
NewServer
(
&
handler
)
server
:=
httptest
.
NewServer
(
&
handler
)
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
method
:=
"GET"
method
:=
"GET"
path
:=
"/foo/bar"
path
:=
"/foo/bar"
body
:=
"somebody"
body
:=
"somebody"
...
@@ -48,7 +49,8 @@ func TestFakeHandlerPath(t *testing.T) {
...
@@ -48,7 +49,8 @@ func TestFakeHandlerPath(t *testing.T) {
func
TestFakeHandlerPathNoBody
(
t
*
testing
.
T
)
{
func
TestFakeHandlerPathNoBody
(
t
*
testing
.
T
)
{
handler
:=
FakeHandler
{}
handler
:=
FakeHandler
{}
server
:=
httptest
.
NewServer
(
&
handler
)
server
:=
httptest
.
NewServer
(
&
handler
)
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
method
:=
"GET"
method
:=
"GET"
path
:=
"/foo/bar"
path
:=
"/foo/bar"
...
@@ -79,7 +81,8 @@ func (f *fakeError) Logf(format string, args ...interface{}) {}
...
@@ -79,7 +81,8 @@ func (f *fakeError) Logf(format string, args ...interface{}) {}
func
TestFakeHandlerWrongPath
(
t
*
testing
.
T
)
{
func
TestFakeHandlerWrongPath
(
t
*
testing
.
T
)
{
handler
:=
FakeHandler
{}
handler
:=
FakeHandler
{}
server
:=
httptest
.
NewServer
(
&
handler
)
server
:=
httptest
.
NewServer
(
&
handler
)
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
method
:=
"GET"
method
:=
"GET"
path
:=
"/foo/bar"
path
:=
"/foo/bar"
fakeT
:=
fakeError
{}
fakeT
:=
fakeError
{}
...
@@ -104,7 +107,8 @@ func TestFakeHandlerWrongPath(t *testing.T) {
...
@@ -104,7 +107,8 @@ func TestFakeHandlerWrongPath(t *testing.T) {
func
TestFakeHandlerWrongMethod
(
t
*
testing
.
T
)
{
func
TestFakeHandlerWrongMethod
(
t
*
testing
.
T
)
{
handler
:=
FakeHandler
{}
handler
:=
FakeHandler
{}
server
:=
httptest
.
NewServer
(
&
handler
)
server
:=
httptest
.
NewServer
(
&
handler
)
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
method
:=
"GET"
method
:=
"GET"
path
:=
"/foo/bar"
path
:=
"/foo/bar"
fakeT
:=
fakeError
{}
fakeT
:=
fakeError
{}
...
@@ -129,7 +133,8 @@ func TestFakeHandlerWrongMethod(t *testing.T) {
...
@@ -129,7 +133,8 @@ func TestFakeHandlerWrongMethod(t *testing.T) {
func
TestFakeHandlerWrongBody
(
t
*
testing
.
T
)
{
func
TestFakeHandlerWrongBody
(
t
*
testing
.
T
)
{
handler
:=
FakeHandler
{}
handler
:=
FakeHandler
{}
server
:=
httptest
.
NewServer
(
&
handler
)
server
:=
httptest
.
NewServer
(
&
handler
)
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
method
:=
"GET"
method
:=
"GET"
path
:=
"/foo/bar"
path
:=
"/foo/bar"
body
:=
"somebody"
body
:=
"somebody"
...
@@ -156,7 +161,8 @@ func TestFakeHandlerWrongBody(t *testing.T) {
...
@@ -156,7 +161,8 @@ func TestFakeHandlerWrongBody(t *testing.T) {
func
TestFakeHandlerNilBody
(
t
*
testing
.
T
)
{
func
TestFakeHandlerNilBody
(
t
*
testing
.
T
)
{
handler
:=
FakeHandler
{}
handler
:=
FakeHandler
{}
server
:=
httptest
.
NewServer
(
&
handler
)
server
:=
httptest
.
NewServer
(
&
handler
)
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
method
:=
"GET"
method
:=
"GET"
path
:=
"/foo/bar"
path
:=
"/foo/bar"
body
:=
"somebody"
body
:=
"somebody"
...
...
pkg/util/httpstream/spdy/roundtripper_test.go
View file @
0df7e695
...
@@ -146,7 +146,8 @@ func TestRoundTripAndNewConnection(t *testing.T) {
...
@@ -146,7 +146,8 @@ func TestRoundTripAndNewConnection(t *testing.T) {
stream
:=
<-
streamCh
stream
:=
<-
streamCh
io
.
Copy
(
stream
,
stream
)
io
.
Copy
(
stream
,
stream
)
}))
}))
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
req
,
err
:=
http
.
NewRequest
(
"GET"
,
server
.
URL
,
nil
)
req
,
err
:=
http
.
NewRequest
(
"GET"
,
server
.
URL
,
nil
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
pkg/util/httpstream/spdy/upgrade_test.go
View file @
0df7e695
...
@@ -66,7 +66,8 @@ func TestUpgradeResponse(t *testing.T) {
...
@@ -66,7 +66,8 @@ func TestUpgradeResponse(t *testing.T) {
}
}
defer
conn
.
Close
()
defer
conn
.
Close
()
}))
}))
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
req
,
err
:=
http
.
NewRequest
(
"GET"
,
server
.
URL
,
nil
)
req
,
err
:=
http
.
NewRequest
(
"GET"
,
server
.
URL
,
nil
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
pkg/util/proxy/transport_test.go
View file @
0df7e695
...
@@ -219,7 +219,8 @@ func TestProxyTransport(t *testing.T) {
...
@@ -219,7 +219,8 @@ func TestProxyTransport(t *testing.T) {
w
.
Header
()
.
Set
(
"Content-Type"
,
item
.
contentType
)
w
.
Header
()
.
Set
(
"Content-Type"
,
item
.
contentType
)
fmt
.
Fprint
(
w
,
item
.
input
)
fmt
.
Fprint
(
w
,
item
.
input
)
}))
}))
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
// Replace source URL with our test server address.
// Replace source URL with our test server address.
sourceURL
:=
parseURLOrDie
(
item
.
sourceURL
)
sourceURL
:=
parseURLOrDie
(
item
.
sourceURL
)
...
...
pkg/util/wsstream/conn_test.go
View file @
0df7e695
...
@@ -36,8 +36,10 @@ func newServer(handler websocket.Handler) (*httptest.Server, string) {
...
@@ -36,8 +36,10 @@ func newServer(handler websocket.Handler) (*httptest.Server, string) {
func
TestRawConn
(
t
*
testing
.
T
)
{
func
TestRawConn
(
t
*
testing
.
T
)
{
conn
:=
NewConn
(
ReadWriteChannel
,
ReadWriteChannel
,
IgnoreChannel
,
ReadChannel
,
WriteChannel
)
conn
:=
NewConn
(
ReadWriteChannel
,
ReadWriteChannel
,
IgnoreChannel
,
ReadChannel
,
WriteChannel
)
s
,
addr
:=
newServer
(
conn
.
handle
)
// TODO: Uncomment next two lines and remove third line when fix #19254
defer
s
.
Close
()
// s, addr := newServer(conn.handle)
// defer s.Close()
_
,
addr
:=
newServer
(
conn
.
handle
)
client
,
err
:=
websocket
.
Dial
(
"ws://"
+
addr
,
""
,
"http://localhost/"
)
client
,
err
:=
websocket
.
Dial
(
"ws://"
+
addr
,
""
,
"http://localhost/"
)
if
err
!=
nil
{
if
err
!=
nil
{
...
@@ -113,8 +115,10 @@ func TestRawConn(t *testing.T) {
...
@@ -113,8 +115,10 @@ func TestRawConn(t *testing.T) {
func
TestBase64Conn
(
t
*
testing
.
T
)
{
func
TestBase64Conn
(
t
*
testing
.
T
)
{
conn
:=
NewConn
(
ReadWriteChannel
,
ReadWriteChannel
)
conn
:=
NewConn
(
ReadWriteChannel
,
ReadWriteChannel
)
s
,
addr
:=
newServer
(
conn
.
handle
)
// TODO: Uncomment next two lines and remove third line when fix #19254
defer
s
.
Close
()
// s, addr := newServer(conn.handle)
// defer s.Close()
_
,
addr
:=
newServer
(
conn
.
handle
)
config
,
err
:=
websocket
.
NewConfig
(
"ws://"
+
addr
,
"http://localhost/"
)
config
,
err
:=
websocket
.
NewConfig
(
"ws://"
+
addr
,
"http://localhost/"
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
plugin/pkg/auth/authenticator/token/oidc/oidc_test.go
View file @
0df7e695
...
@@ -237,7 +237,8 @@ func TestOIDCDiscoverySecureConnection(t *testing.T) {
...
@@ -237,7 +237,8 @@ func TestOIDCDiscoverySecureConnection(t *testing.T) {
// Verify that plain HTTP issuer URL is forbidden.
// Verify that plain HTTP issuer URL is forbidden.
op
:=
newOIDCProvider
(
t
)
op
:=
newOIDCProvider
(
t
)
srv
:=
httptest
.
NewServer
(
op
.
mux
)
srv
:=
httptest
.
NewServer
(
op
.
mux
)
defer
srv
.
Close
()
// TODO: Uncomment when fix #19254
// defer srv.Close()
op
.
pcfg
=
oidc
.
ProviderConfig
{
op
.
pcfg
=
oidc
.
ProviderConfig
{
Issuer
:
srv
.
URL
,
Issuer
:
srv
.
URL
,
...
...
plugin/pkg/scheduler/factory/factory_test.go
View file @
0df7e695
...
@@ -43,7 +43,8 @@ func TestCreate(t *testing.T) {
...
@@ -43,7 +43,8 @@ func TestCreate(t *testing.T) {
T
:
t
,
T
:
t
,
}
}
server
:=
httptest
.
NewServer
(
&
handler
)
server
:=
httptest
.
NewServer
(
&
handler
)
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
server
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
server
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
factory
:=
NewConfigFactory
(
client
,
nil
,
api
.
DefaultSchedulerName
)
factory
:=
NewConfigFactory
(
client
,
nil
,
api
.
DefaultSchedulerName
)
factory
.
Create
()
factory
.
Create
()
...
@@ -61,7 +62,8 @@ func TestCreateFromConfig(t *testing.T) {
...
@@ -61,7 +62,8 @@ func TestCreateFromConfig(t *testing.T) {
T
:
t
,
T
:
t
,
}
}
server
:=
httptest
.
NewServer
(
&
handler
)
server
:=
httptest
.
NewServer
(
&
handler
)
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
server
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
server
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
factory
:=
NewConfigFactory
(
client
,
nil
,
api
.
DefaultSchedulerName
)
factory
:=
NewConfigFactory
(
client
,
nil
,
api
.
DefaultSchedulerName
)
...
@@ -103,7 +105,8 @@ func TestCreateFromEmptyConfig(t *testing.T) {
...
@@ -103,7 +105,8 @@ func TestCreateFromEmptyConfig(t *testing.T) {
T
:
t
,
T
:
t
,
}
}
server
:=
httptest
.
NewServer
(
&
handler
)
server
:=
httptest
.
NewServer
(
&
handler
)
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
server
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
server
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
factory
:=
NewConfigFactory
(
client
,
nil
,
api
.
DefaultSchedulerName
)
factory
:=
NewConfigFactory
(
client
,
nil
,
api
.
DefaultSchedulerName
)
...
@@ -147,7 +150,8 @@ func TestDefaultErrorFunc(t *testing.T) {
...
@@ -147,7 +150,8 @@ func TestDefaultErrorFunc(t *testing.T) {
// FakeHandler musn't be sent requests other than the one you want to test.
// FakeHandler musn't be sent requests other than the one you want to test.
mux
.
Handle
(
testapi
.
Default
.
ResourcePath
(
"pods"
,
"bar"
,
"foo"
),
&
handler
)
mux
.
Handle
(
testapi
.
Default
.
ResourcePath
(
"pods"
,
"bar"
,
"foo"
),
&
handler
)
server
:=
httptest
.
NewServer
(
mux
)
server
:=
httptest
.
NewServer
(
mux
)
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
factory
:=
NewConfigFactory
(
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
server
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()}),
nil
,
api
.
DefaultSchedulerName
)
factory
:=
NewConfigFactory
(
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
server
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()}),
nil
,
api
.
DefaultSchedulerName
)
queue
:=
cache
.
NewFIFO
(
cache
.
MetaNamespaceKeyFunc
)
queue
:=
cache
.
NewFIFO
(
cache
.
MetaNamespaceKeyFunc
)
podBackoff
:=
podBackoff
{
podBackoff
:=
podBackoff
{
...
@@ -230,7 +234,8 @@ func TestBind(t *testing.T) {
...
@@ -230,7 +234,8 @@ func TestBind(t *testing.T) {
T
:
t
,
T
:
t
,
}
}
server
:=
httptest
.
NewServer
(
&
handler
)
server
:=
httptest
.
NewServer
(
&
handler
)
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
server
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
server
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
b
:=
binder
{
client
}
b
:=
binder
{
client
}
...
@@ -315,7 +320,8 @@ func TestResponsibleForPod(t *testing.T) {
...
@@ -315,7 +320,8 @@ func TestResponsibleForPod(t *testing.T) {
T
:
t
,
T
:
t
,
}
}
server
:=
httptest
.
NewServer
(
&
handler
)
server
:=
httptest
.
NewServer
(
&
handler
)
defer
server
.
Close
()
// TODO: Uncomment when fix #19254
// defer server.Close()
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
server
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
client
:=
client
.
NewOrDie
(
&
client
.
Config
{
Host
:
server
.
URL
,
GroupVersion
:
testapi
.
Default
.
GroupVersion
()})
// factory of "default-scheduler"
// factory of "default-scheduler"
factoryDefaultScheduler
:=
NewConfigFactory
(
client
,
nil
,
api
.
DefaultSchedulerName
)
factoryDefaultScheduler
:=
NewConfigFactory
(
client
,
nil
,
api
.
DefaultSchedulerName
)
...
...
test/component/scheduler/perf/util.go
View file @
0df7e695
...
@@ -71,7 +71,8 @@ func mustSetupScheduler() (schedulerConfigFactory *factory.ConfigFactory, destro
...
@@ -71,7 +71,8 @@ func mustSetupScheduler() (schedulerConfigFactory *factory.ConfigFactory, destro
destroyFunc
=
func
()
{
destroyFunc
=
func
()
{
glog
.
Infof
(
"destroying"
)
glog
.
Infof
(
"destroying"
)
close
(
schedulerConfig
.
StopEverything
)
close
(
schedulerConfig
.
StopEverything
)
s
.
Close
()
// TODO: Uncomment when fix #19254
// s.Close()
glog
.
Infof
(
"destroyed"
)
glog
.
Infof
(
"destroyed"
)
}
}
return
return
...
...
test/integration/auth_test.go
View file @
0df7e695
...
@@ -390,7 +390,8 @@ func TestAuthModeAlwaysAllow(t *testing.T) {
...
@@ -390,7 +390,8 @@ func TestAuthModeAlwaysAllow(t *testing.T) {
s
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
req
*
http
.
Request
)
{
s
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
req
*
http
.
Request
)
{
m
.
Handler
.
ServeHTTP
(
w
,
req
)
m
.
Handler
.
ServeHTTP
(
w
,
req
)
}))
}))
defer
s
.
Close
()
// TODO: Uncomment when fix #19254
// defer s.Close()
masterConfig
:=
framework
.
NewIntegrationTestMasterConfig
()
masterConfig
:=
framework
.
NewIntegrationTestMasterConfig
()
m
=
master
.
New
(
masterConfig
)
m
=
master
.
New
(
masterConfig
)
...
@@ -492,7 +493,8 @@ func TestAuthModeAlwaysDeny(t *testing.T) {
...
@@ -492,7 +493,8 @@ func TestAuthModeAlwaysDeny(t *testing.T) {
s
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
req
*
http
.
Request
)
{
s
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
req
*
http
.
Request
)
{
m
.
Handler
.
ServeHTTP
(
w
,
req
)
m
.
Handler
.
ServeHTTP
(
w
,
req
)
}))
}))
defer
s
.
Close
()
// TODO: Uncomment when fix #19254
// defer s.Close()
masterConfig
:=
framework
.
NewIntegrationTestMasterConfig
()
masterConfig
:=
framework
.
NewIntegrationTestMasterConfig
()
masterConfig
.
Authorizer
=
apiserver
.
NewAlwaysDenyAuthorizer
()
masterConfig
.
Authorizer
=
apiserver
.
NewAlwaysDenyAuthorizer
()
...
@@ -546,7 +548,8 @@ func TestAliceNotForbiddenOrUnauthorized(t *testing.T) {
...
@@ -546,7 +548,8 @@ func TestAliceNotForbiddenOrUnauthorized(t *testing.T) {
s
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
req
*
http
.
Request
)
{
s
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
req
*
http
.
Request
)
{
m
.
Handler
.
ServeHTTP
(
w
,
req
)
m
.
Handler
.
ServeHTTP
(
w
,
req
)
}))
}))
defer
s
.
Close
()
// TODO: Uncomment when fix #19254
// defer s.Close()
masterConfig
:=
framework
.
NewIntegrationTestMasterConfig
()
masterConfig
:=
framework
.
NewIntegrationTestMasterConfig
()
masterConfig
.
Authenticator
=
getTestTokenAuth
()
masterConfig
.
Authenticator
=
getTestTokenAuth
()
...
@@ -621,7 +624,8 @@ func TestBobIsForbidden(t *testing.T) {
...
@@ -621,7 +624,8 @@ func TestBobIsForbidden(t *testing.T) {
s
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
req
*
http
.
Request
)
{
s
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
req
*
http
.
Request
)
{
m
.
Handler
.
ServeHTTP
(
w
,
req
)
m
.
Handler
.
ServeHTTP
(
w
,
req
)
}))
}))
defer
s
.
Close
()
// TODO: Uncomment when fix #19254
// defer s.Close()
masterConfig
:=
framework
.
NewIntegrationTestMasterConfig
()
masterConfig
:=
framework
.
NewIntegrationTestMasterConfig
()
masterConfig
.
Authenticator
=
getTestTokenAuth
()
masterConfig
.
Authenticator
=
getTestTokenAuth
()
...
@@ -669,7 +673,8 @@ func TestUnknownUserIsUnauthorized(t *testing.T) {
...
@@ -669,7 +673,8 @@ func TestUnknownUserIsUnauthorized(t *testing.T) {
s
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
req
*
http
.
Request
)
{
s
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
req
*
http
.
Request
)
{
m
.
Handler
.
ServeHTTP
(
w
,
req
)
m
.
Handler
.
ServeHTTP
(
w
,
req
)
}))
}))
defer
s
.
Close
()
// TODO: Uncomment when fix #19254
// defer s.Close()
masterConfig
:=
framework
.
NewIntegrationTestMasterConfig
()
masterConfig
:=
framework
.
NewIntegrationTestMasterConfig
()
masterConfig
.
Authenticator
=
getTestTokenAuth
()
masterConfig
.
Authenticator
=
getTestTokenAuth
()
...
@@ -742,7 +747,8 @@ func TestAuthorizationAttributeDetermination(t *testing.T) {
...
@@ -742,7 +747,8 @@ func TestAuthorizationAttributeDetermination(t *testing.T) {
s
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
req
*
http
.
Request
)
{
s
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
req
*
http
.
Request
)
{
m
.
Handler
.
ServeHTTP
(
w
,
req
)
m
.
Handler
.
ServeHTTP
(
w
,
req
)
}))
}))
defer
s
.
Close
()
// TODO: Uncomment when fix #19254
// defer s.Close()
masterConfig
:=
framework
.
NewIntegrationTestMasterConfig
()
masterConfig
:=
framework
.
NewIntegrationTestMasterConfig
()
masterConfig
.
Authenticator
=
getTestTokenAuth
()
masterConfig
.
Authenticator
=
getTestTokenAuth
()
...
@@ -810,7 +816,8 @@ func TestNamespaceAuthorization(t *testing.T) {
...
@@ -810,7 +816,8 @@ func TestNamespaceAuthorization(t *testing.T) {
s
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
req
*
http
.
Request
)
{
s
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
req
*
http
.
Request
)
{
m
.
Handler
.
ServeHTTP
(
w
,
req
)
m
.
Handler
.
ServeHTTP
(
w
,
req
)
}))
}))
defer
s
.
Close
()
// TODO: Uncomment when fix #19254
// defer s.Close()
masterConfig
:=
framework
.
NewIntegrationTestMasterConfig
()
masterConfig
:=
framework
.
NewIntegrationTestMasterConfig
()
masterConfig
.
Authenticator
=
getTestTokenAuth
()
masterConfig
.
Authenticator
=
getTestTokenAuth
()
...
@@ -912,7 +919,8 @@ func TestKindAuthorization(t *testing.T) {
...
@@ -912,7 +919,8 @@ func TestKindAuthorization(t *testing.T) {
s
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
req
*
http
.
Request
)
{
s
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
req
*
http
.
Request
)
{
m
.
Handler
.
ServeHTTP
(
w
,
req
)
m
.
Handler
.
ServeHTTP
(
w
,
req
)
}))
}))
defer
s
.
Close
()
// TODO: Uncomment when fix #19254
// defer s.Close()
masterConfig
:=
framework
.
NewIntegrationTestMasterConfig
()
masterConfig
:=
framework
.
NewIntegrationTestMasterConfig
()
masterConfig
.
Authenticator
=
getTestTokenAuth
()
masterConfig
.
Authenticator
=
getTestTokenAuth
()
...
@@ -1001,7 +1009,8 @@ func TestReadOnlyAuthorization(t *testing.T) {
...
@@ -1001,7 +1009,8 @@ func TestReadOnlyAuthorization(t *testing.T) {
s
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
req
*
http
.
Request
)
{
s
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
req
*
http
.
Request
)
{
m
.
Handler
.
ServeHTTP
(
w
,
req
)
m
.
Handler
.
ServeHTTP
(
w
,
req
)
}))
}))
defer
s
.
Close
()
// TODO: Uncomment when fix #19254
// defer s.Close()
masterConfig
:=
framework
.
NewIntegrationTestMasterConfig
()
masterConfig
:=
framework
.
NewIntegrationTestMasterConfig
()
masterConfig
.
Authenticator
=
getTestTokenAuth
()
masterConfig
.
Authenticator
=
getTestTokenAuth
()
...
...
test/integration/extender_test.go
View file @
0df7e695
...
@@ -191,7 +191,8 @@ func TestSchedulerExtender(t *testing.T) {
...
@@ -191,7 +191,8 @@ func TestSchedulerExtender(t *testing.T) {
s
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
req
*
http
.
Request
)
{
s
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
req
*
http
.
Request
)
{
m
.
Handler
.
ServeHTTP
(
w
,
req
)
m
.
Handler
.
ServeHTTP
(
w
,
req
)
}))
}))
defer
s
.
Close
()
// TODO: Uncomment when fix #19254
// defer s.Close()
masterConfig
:=
framework
.
NewIntegrationTestMasterConfig
()
masterConfig
:=
framework
.
NewIntegrationTestMasterConfig
()
m
=
master
.
New
(
masterConfig
)
m
=
master
.
New
(
masterConfig
)
...
@@ -206,7 +207,8 @@ func TestSchedulerExtender(t *testing.T) {
...
@@ -206,7 +207,8 @@ func TestSchedulerExtender(t *testing.T) {
es1
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
req
*
http
.
Request
)
{
es1
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
req
*
http
.
Request
)
{
extender1
.
serveHTTP
(
t
,
w
,
req
)
extender1
.
serveHTTP
(
t
,
w
,
req
)
}))
}))
defer
es1
.
Close
()
// TODO: Uncomment when fix #19254
// defer es1.Close()
extender2
:=
&
Extender
{
extender2
:=
&
Extender
{
name
:
"extender2"
,
name
:
"extender2"
,
...
@@ -216,7 +218,8 @@ func TestSchedulerExtender(t *testing.T) {
...
@@ -216,7 +218,8 @@ func TestSchedulerExtender(t *testing.T) {
es2
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
req
*
http
.
Request
)
{
es2
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
req
*
http
.
Request
)
{
extender2
.
serveHTTP
(
t
,
w
,
req
)
extender2
.
serveHTTP
(
t
,
w
,
req
)
}))
}))
defer
es2
.
Close
()
// TODO: Uncomment when fix #19254
// defer es2.Close()
policy
:=
schedulerapi
.
Policy
{
policy
:=
schedulerapi
.
Policy
{
ExtenderConfigs
:
[]
schedulerapi
.
ExtenderConfig
{
ExtenderConfigs
:
[]
schedulerapi
.
ExtenderConfig
{
...
...
test/integration/framework/master_utils.go
View file @
0df7e695
...
@@ -183,7 +183,8 @@ func (m *MasterComponents) Stop(apiServer, rcManager bool) {
...
@@ -183,7 +183,8 @@ func (m *MasterComponents) Stop(apiServer, rcManager bool) {
m
.
once
.
Do
(
m
.
stopRCManager
)
m
.
once
.
Do
(
m
.
stopRCManager
)
}
}
if
apiServer
{
if
apiServer
{
m
.
ApiServer
.
Close
()
// TODO: Uncomment when fix #19254
// m.ApiServer.Close()
}
}
}
}
...
...
test/integration/scheduler_test.go
View file @
0df7e695
...
@@ -58,7 +58,8 @@ func TestUnschedulableNodes(t *testing.T) {
...
@@ -58,7 +58,8 @@ func TestUnschedulableNodes(t *testing.T) {
s
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
req
*
http
.
Request
)
{
s
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
req
*
http
.
Request
)
{
m
.
Handler
.
ServeHTTP
(
w
,
req
)
m
.
Handler
.
ServeHTTP
(
w
,
req
)
}))
}))
defer
s
.
Close
()
// TODO: Uncomment when fix #19254
// defer s.Close()
masterConfig
:=
framework
.
NewIntegrationTestMasterConfig
()
masterConfig
:=
framework
.
NewIntegrationTestMasterConfig
()
m
=
master
.
New
(
masterConfig
)
m
=
master
.
New
(
masterConfig
)
...
@@ -281,7 +282,8 @@ func TestMultiScheduler(t *testing.T) {
...
@@ -281,7 +282,8 @@ func TestMultiScheduler(t *testing.T) {
s
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
req
*
http
.
Request
)
{
s
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
req
*
http
.
Request
)
{
m
.
Handler
.
ServeHTTP
(
w
,
req
)
m
.
Handler
.
ServeHTTP
(
w
,
req
)
}))
}))
defer
s
.
Close
()
// TODO: Uncomment when fix #19254
// defer s.Close()
masterConfig
:=
framework
.
NewIntegrationTestMasterConfig
()
masterConfig
:=
framework
.
NewIntegrationTestMasterConfig
()
m
=
master
.
New
(
masterConfig
)
m
=
master
.
New
(
masterConfig
)
...
...
test/integration/secret_test.go
View file @
0df7e695
...
@@ -49,7 +49,8 @@ func TestSecrets(t *testing.T) {
...
@@ -49,7 +49,8 @@ func TestSecrets(t *testing.T) {
s
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
req
*
http
.
Request
)
{
s
:=
httptest
.
NewServer
(
http
.
HandlerFunc
(
func
(
w
http
.
ResponseWriter
,
req
*
http
.
Request
)
{
m
.
Handler
.
ServeHTTP
(
w
,
req
)
m
.
Handler
.
ServeHTTP
(
w
,
req
)
}))
}))
defer
s
.
Close
()
// TODO: Uncomment when fix #19254
// defer s.Close()
masterConfig
:=
framework
.
NewIntegrationTestMasterConfig
()
masterConfig
:=
framework
.
NewIntegrationTestMasterConfig
()
m
=
master
.
New
(
masterConfig
)
m
=
master
.
New
(
masterConfig
)
...
...
test/integration/service_account_test.go
View file @
0df7e695
...
@@ -422,7 +422,8 @@ func startServiceAccountTestServer(t *testing.T) (*client.Client, client.Config,
...
@@ -422,7 +422,8 @@ func startServiceAccountTestServer(t *testing.T) (*client.Client, client.Config,
tokenController
.
Stop
()
tokenController
.
Stop
()
serviceAccountController
.
Stop
()
serviceAccountController
.
Stop
()
serviceAccountAdmission
.
Stop
()
serviceAccountAdmission
.
Stop
()
apiServer
.
Close
()
// TODO: Uncomment when fix #19254
// apiServer.Close()
}
}
return
rootClient
,
clientConfig
,
stop
return
rootClient
,
clientConfig
,
stop
...
...
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