Merge pull request #115 from monnand/default-get-info

remove TestGetContainerInfoWithDefaultValue()

manager/manager_test.go

@@ -162,96 +162,3 @@ func TestGetContainerInfo(t *testing.T) {
 	}
 
 }
-
-func TestGetContainerInfoWithDefaultValue(t *testing.T) {
-	containers := []string{
-		"/c1",
-		"/c2",
-	}
-
-	query := &info.ContainerInfoRequest{
-		NumStats:               64,
-		NumSamples:             64,
-		CpuUsagePercentiles:    []int{50, 80, 90},
-		MemoryUsagePercentiles: []int{50, 80, 90},
-	}
-
-	infosMap := make(map[string]*info.ContainerInfo, len(containers))
-	handlerMap := make(map[string]*container.MockContainerHandler, len(containers))
-
-	for _, container := range containers {
-		infosMap[container] = itest.GenerateRandomContainerInfo(container, 4, query, 1*time.Second)
-	}
-
-	driver := &stest.MockStorageDriver{}
-	m := createManagerAndAddContainers(
-		driver,
-		containers,
-		func(h *container.MockContainerHandler) {
-			cinfo := infosMap[h.Name]
-			stats := cinfo.Stats
-			samples := cinfo.Samples
-			percentiles := cinfo.StatsPercentiles
-			spec := cinfo.Spec
-			driver.On(
-				"Percentiles",
-				h.Name,
-				query.CpuUsagePercentiles,
-				query.MemoryUsagePercentiles,
-			).Return(
-				percentiles,
-				nil,
-			)
-
-			driver.On(
-				"Samples",
-				h.Name,
-				query.NumSamples,
-			).Return(
-				samples,
-				nil,
-			)
-
-			driver.On(
-				"RecentStats",
-				h.Name,
-				query.NumStats,
-			).Return(
-				stats,
-				nil,
-			)
-
-			h.On("ListContainers", container.LIST_SELF).Return(
-				[]info.ContainerReference(nil),
-				nil,
-			)
-			h.On("GetSpec").Return(
-				spec,
-				nil,
-			)
-			handlerMap[h.Name] = h
-		},
-		t,
-	)
-
-	returnedInfos := make(map[string]*info.ContainerInfo, len(containers))
-
-	for _, container := range containers {
-		// nil should give us default values
-		cinfo, err := m.GetContainerInfo(container, nil)
-		if err != nil {
-			t.Fatalf("Unable to get info for container %v: %v", container, err)
-		}
-		returnedInfos[container] = cinfo
-	}
-
-	for container, handler := range handlerMap {
-		handler.AssertExpectations(t)
-		returned := returnedInfos[container]
-		expected := infosMap[container]
-		if !reflect.DeepEqual(returned, expected) {
-			t.Errorf("returned unexpected info for container %v; returned %+v; expected %+v", container, returned, expected)
-		}
-	}
-
-}