github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13286 from nikhiljindal/validateDeployment

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-08-28 22:37:55 -07:00
parent c49466a7d4 92f373a4b6
commit e5ac413311
9 changed files with 375 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/api/validation/validation_test.go
View File

@@ -234,7 +234,6 @@ func TestValidateAnnotations(t *testing.T) {
}
func testVolume(name string, namespace string, spec api.PersistentVolumeSpec) *api.PersistentVolume {
objMeta := api.ObjectMeta{Name: name}
if namespace != "" {
objMeta.Namespace = namespace
@@ -247,7 +246,6 @@ func testVolume(name string, namespace string, spec api.PersistentVolumeSpec) *a
}
func TestValidatePersistentVolumes(t *testing.T) {
scenarios := map[string]struct {
isExpectedFailure bool
volume *api.PersistentVolume
@@ -358,7 +356,6 @@ func testVolumeClaim(name string, namespace string, spec api.PersistentVolumeCla
}
func TestValidatePersistentVolumeClaim(t *testing.T) {
scenarios := map[string]struct {
isExpectedFailure bool
claim *api.PersistentVolumeClaim
@@ -802,7 +799,6 @@ func TestValidatePullPolicy(t *testing.T) {
t.Errorf("case[%s] expected policy %v, got %v", k, v.ExpectedPolicy, ctr.ImagePullPolicy)
}
}
}
func getResourceLimits(cpu, memory string) api.ResourceList {
@@ -2144,7 +2140,6 @@ func TestValidateReplicationControllerUpdate(t *testing.T) {
t.Errorf("expected failure: %s", testName)
}
}
}
func TestValidateReplicationController(t *testing.T) {