Remove unused code in kubelet/server_test.go

The code creates a channel and a go routine waiting for update, which is never
used by any test. Remove the unused code.
This commit is contained in:
Yu-Ju Hong 2015-04-07 11:55:19 -07:00
parent 1ccfa589e7
commit d6b4633432
2 changed files with 1 additions and 32 deletions

View File

@ -433,32 +433,6 @@ func TestKillContainer(t *testing.T) {
}
}
type channelReader struct {
list [][]api.Pod
wg sync.WaitGroup
}
func startReading(channel <-chan interface{}) *channelReader {
cr := &channelReader{}
cr.wg.Add(1)
go func() {
for {
update, ok := <-channel
if !ok {
break
}
cr.list = append(cr.list, update.(PodUpdate).Pods)
}
cr.wg.Done()
}()
return cr
}
func (cr *channelReader) GetList() [][]api.Pod {
cr.wg.Wait()
return cr.list
}
var emptyPodUIDs map[types.UID]metrics.SyncPodType
func TestSyncPodsDoesNothing(t *testing.T) {

View File

@ -112,18 +112,13 @@ func (fk *fakeKubelet) StreamingConnectionIdleTimeout() time.Duration {
}
type serverTestFramework struct {
updateChan chan interface{}
updateReader *channelReader
serverUnderTest *Server
fakeKubelet *fakeKubelet
testHTTPServer *httptest.Server
}
func newServerTest() *serverTestFramework {
fw := &serverTestFramework{
updateChan: make(chan interface{}),
}
fw.updateReader = startReading(fw.updateChan)
fw := &serverTestFramework{}
fw.fakeKubelet = &fakeKubelet{
podByNameFunc: func(namespace, name string) (*api.Pod, bool) {
return &api.Pod{