Skip to content

K
k3s
Commit 5923fd35 authored by zhouhaibing089's avatar zhouhaibing089 Committed by haibzhou
Browse files
Options

followup to add http server close method

parent 43b644ea
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 33 deletions
pkg/genericapiserver/genericapiserver_test.go
View file @ 5923fd35
......@@ -141,8 +141,8 @@ func TestInstallAPIGroups(t *testing.T) {
}
s.InstallAPIGroups(apiGroupsInfo)
// TODO: Close() this server when fix #19254
server := httptest.NewServer(s.HandlerContainer.ServeMux)
defer server.Close()
validPaths := []string{
// "/api"
config.APIPrefix,
......
pkg/kubelet/server/server_test.go
View file @ 5923fd35
......@@ -214,7 +214,6 @@ func newServerTest() *serverTestFramework {
true,
&kubecontainertesting.Mock{})
fw.serverUnderTest = &server
// TODO: Close() this when fix #19254
fw.testHTTPServer = httptest.NewServer(fw.serverUnderTest)
return fw
}
......@@ -244,6 +243,7 @@ func getPodName(name, namespace string) string {
func TestContainerInfo(t *testing.T) {
fw := newServerTest()
defer fw.testHTTPServer.Close()
expectedInfo := &cadvisorapi.ContainerInfo{}
podID := "somepod"
expectedPodID := getPodName(podID, "")
......@@ -272,6 +272,7 @@ func TestContainerInfo(t *testing.T) {
func TestContainerInfoWithUidNamespace(t *testing.T) {
fw := newServerTest()
defer fw.testHTTPServer.Close()
expectedInfo := &cadvisorapi.ContainerInfo{}
podID := "somepod"
expectedNamespace := "custom"
......@@ -302,6 +303,7 @@ func TestContainerInfoWithUidNamespace(t *testing.T) {
func TestContainerNotFound(t *testing.T) {
fw := newServerTest()
defer fw.testHTTPServer.Close()
podID := "somepod"
expectedNamespace := "custom"
expectedContainerName := "slowstartcontainer"
......@@ -321,6 +323,7 @@ func TestContainerNotFound(t *testing.T) {
func TestRootInfo(t *testing.T) {
fw := newServerTest()
defer fw.testHTTPServer.Close()
expectedInfo := &cadvisorapi.ContainerInfo{
ContainerReference: cadvisorapi.ContainerReference{
Name: "/",
......@@ -349,6 +352,7 @@ func TestRootInfo(t *testing.T) {
func TestSubcontainerContainerInfo(t *testing.T) {
fw := newServerTest()
defer fw.testHTTPServer.Close()
const kubeletContainer = "/kubelet"
const kubeletSubContainer = "/kubelet/sub"
expectedInfo := map[string]*cadvisorapi.ContainerInfo{
......@@ -394,6 +398,7 @@ func TestSubcontainerContainerInfo(t *testing.T) {
func TestMachineInfo(t *testing.T) {
fw := newServerTest()
defer fw.testHTTPServer.Close()
expectedInfo := &cadvisorapi.MachineInfo{
NumCores: 4,
MemoryCapacity: 1024,
......@@ -419,6 +424,7 @@ func TestMachineInfo(t *testing.T) {
func TestServeLogs(t *testing.T) {
fw := newServerTest()
defer fw.testHTTPServer.Close()
content := string(`<pre><a href="kubelet.log">kubelet.log</a><a href="google.log">google.log</a></pre>`)
......@@ -447,6 +453,7 @@ func TestServeLogs(t *testing.T) {
func TestServeRunInContainer(t *testing.T) {
fw := newServerTest()
defer fw.testHTTPServer.Close()
output := "foo bar"
podNamespace := "other"
podName := "foo"
......@@ -487,6 +494,7 @@ func TestServeRunInContainer(t *testing.T) {
func TestServeRunInContainerWithUID(t *testing.T) {
fw := newServerTest()
defer fw.testHTTPServer.Close()
output := "foo bar"
podNamespace := "other"
podName := "foo"
......@@ -531,6 +539,7 @@ func TestServeRunInContainerWithUID(t *testing.T) {
func TestHealthCheck(t *testing.T) {
fw := newServerTest()
defer fw.testHTTPServer.Close()
fw.fakeKubelet.hostnameFunc = func() string {
return "127.0.0.1"
}
......@@ -563,6 +572,7 @@ type authTestCase struct {
func TestAuthFilters(t *testing.T) {
fw := newServerTest()
defer fw.testHTTPServer.Close()
testcases := []authTestCase{}
......@@ -665,6 +675,7 @@ func TestAuthenticationFailure(t *testing.T) {
)
fw := newServerTest()
defer fw.testHTTPServer.Close()
fw.fakeAuth.authenticateFunc = func(req *http.Request) (user.Info, bool, error) {
calledAuthenticate = true
return nil, false, nil
......@@ -702,6 +713,7 @@ func TestAuthorizationSuccess(t *testing.T) {
)
fw := newServerTest()
defer fw.testHTTPServer.Close()
fw.fakeAuth.authenticateFunc = func(req *http.Request) (user.Info, bool, error) {
calledAuthenticate = true
return expectedUser, true, nil
......@@ -730,6 +742,7 @@ func TestAuthorizationSuccess(t *testing.T) {
func TestSyncLoopCheck(t *testing.T) {
fw := newServerTest()
defer fw.testHTTPServer.Close()
fw.fakeKubelet.hostnameFunc = func() string {
return "127.0.0.1"
}
......@@ -746,6 +759,7 @@ func TestSyncLoopCheck(t *testing.T) {
func TestPLEGHealthCheck(t *testing.T) {
fw := newServerTest()
defer fw.testHTTPServer.Close()
fw.fakeKubelet.hostnameFunc = func() string {
return "127.0.0.1"
}
......@@ -814,6 +828,7 @@ func setGetContainerLogsFunc(fw *serverTestFramework, t *testing.T, expectedPodN
// TODO: I really want to be a table driven test
func TestContainerLogs(t *testing.T) {
fw := newServerTest()
defer fw.testHTTPServer.Close()
output := "foo bar"
podNamespace := "other"
podName := "foo"
......@@ -839,6 +854,7 @@ func TestContainerLogs(t *testing.T) {
func TestContainerLogsWithLimitBytes(t *testing.T) {
fw := newServerTest()
defer fw.testHTTPServer.Close()
output := "foo bar"
podNamespace := "other"
podName := "foo"
......@@ -865,6 +881,7 @@ func TestContainerLogsWithLimitBytes(t *testing.T) {
func TestContainerLogsWithTail(t *testing.T) {
fw := newServerTest()
defer fw.testHTTPServer.Close()
output := "foo bar"
podNamespace := "other"
podName := "foo"
......@@ -891,6 +908,7 @@ func TestContainerLogsWithTail(t *testing.T) {
func TestContainerLogsWithLegacyTail(t *testing.T) {
fw := newServerTest()
defer fw.testHTTPServer.Close()
output := "foo bar"
podNamespace := "other"
podName := "foo"
......@@ -917,6 +935,7 @@ func TestContainerLogsWithLegacyTail(t *testing.T) {
func TestContainerLogsWithTailAll(t *testing.T) {
fw := newServerTest()
defer fw.testHTTPServer.Close()
output := "foo bar"
podNamespace := "other"
podName := "foo"
......@@ -942,6 +961,7 @@ func TestContainerLogsWithTailAll(t *testing.T) {
func TestContainerLogsWithInvalidTail(t *testing.T) {
fw := newServerTest()
defer fw.testHTTPServer.Close()
output := "foo bar"
podNamespace := "other"
podName := "foo"
......@@ -961,6 +981,7 @@ func TestContainerLogsWithInvalidTail(t *testing.T) {
func TestContainerLogsWithFollow(t *testing.T) {
fw := newServerTest()
defer fw.testHTTPServer.Close()
output := "foo bar"
podNamespace := "other"
podName := "foo"
......@@ -986,6 +1007,7 @@ func TestContainerLogsWithFollow(t *testing.T) {
func TestServeExecInContainerIdleTimeout(t *testing.T) {
fw := newServerTest()
defer fw.testHTTPServer.Close()
fw.fakeKubelet.streamingConnectionIdleTimeoutFunc = func() time.Duration {
return 100 * time.Millisecond
......@@ -1041,6 +1063,7 @@ func testExecAttach(t *testing.T, verb string) {
for i, test := range tests {
fw := newServerTest()
defer fw.testHTTPServer.Close()
fw.fakeKubelet.streamingConnectionIdleTimeoutFunc = func() time.Duration {
return 0
......@@ -1293,6 +1316,7 @@ func TestServeAttachContainer(t *testing.T) {
func TestServePortForwardIdleTimeout(t *testing.T) {
fw := newServerTest()
defer fw.testHTTPServer.Close()
fw.fakeKubelet.streamingConnectionIdleTimeoutFunc = func() time.Duration {
return 100 * time.Millisecond
......@@ -1351,6 +1375,7 @@ func TestServePortForward(t *testing.T) {
for i, test := range tests {
fw := newServerTest()
defer fw.testHTTPServer.Close()
fw.fakeKubelet.streamingConnectionIdleTimeoutFunc = func() time.Duration {
return 0
......
pkg/probe/http/http_test.go
View file @ 5923fd35
......@@ -121,34 +121,36 @@ func TestHTTPProbeChecker(t *testing.T) {
},
}
for _, test := range testCases {
// TODO: Close() this when fix #19254
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
test.handler(w, r)
}))
u, err := url.Parse(server.URL)
if err != nil {
t.Errorf("Unexpected error: %v", err)
}
_, port, err := net.SplitHostPort(u.Host)
if err != nil {
t.Errorf("Unexpected error: %v", err)
}
_, err = strconv.Atoi(port)
if err != nil {
t.Errorf("Unexpected error: %v", err)
}
health, output, err := prober.Probe(u, test.reqHeaders, 1*time.Second)
if test.health == probe.Unknown && err == nil {
t.Errorf("Expected error")
}
if test.health != probe.Unknown && err != nil {
t.Errorf("Unexpected error: %v", err)
}
if health != test.health {
t.Errorf("Expected %v, got %v", test.health, health)
}
if !containsAny(output, test.accBodies) {
t.Errorf("Expected one of %#v, got %v", test.accBodies, output)
}
func() {
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
test.handler(w, r)
}))
defer server.Close()
u, err := url.Parse(server.URL)
if err != nil {
t.Errorf("Unexpected error: %v", err)
}
_, port, err := net.SplitHostPort(u.Host)
if err != nil {
t.Errorf("Unexpected error: %v", err)
}
_, err = strconv.Atoi(port)
if err != nil {
t.Errorf("Unexpected error: %v", err)
}
health, output, err := prober.Probe(u, test.reqHeaders, 1*time.Second)
if test.health == probe.Unknown && err == nil {
t.Errorf("Expected error")
}
if test.health != probe.Unknown && err != nil {
t.Errorf("Unexpected error: %v", err)
}
if health != test.health {
t.Errorf("Expected %v, got %v", test.health, health)
}
if !containsAny(output, test.accBodies) {
t.Errorf("Expected one of %#v, got %v", test.accBodies, output)
}
}()
}
}
pkg/proxy/userspace/proxier_test.go
View file @ 5923fd35
......@@ -23,6 +23,7 @@ import (
"net/http"
"net/http/httptest"
"net/url"
"os"
"strconv"
"sync/atomic"
"testing"
......@@ -85,16 +86,17 @@ func waitForClosedPortUDP(p *Proxier, proxyPort int) error {
var tcpServerPort int32
var udpServerPort int32
func init() {
func TestMain(m *testing.M) {
// Don't handle panics
runtime.ReallyCrash = true
// TCP setup.
// TODO: Close() this when fix #19254
tcp := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusOK)
w.Write([]byte(r.URL.Path[1:]))
}))
defer tcp.Close()
u, err := url.Parse(tcp.URL)
if err != nil {
panic(fmt.Sprintf("failed to parse: %v", err))
......@@ -124,6 +126,11 @@ func init() {
}
udpServerPort = int32(udpServerPortValue)
go udp.Loop()
ret := m.Run()
// it should be safe to call Close() multiple times.
tcp.Close()
os.Exit(ret)
}
func testEchoTCP(t *testing.T, address string, port int) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment