Merge pull request #34643 from mbohlool/h2o

Automatic merge from submit-queue Enable OpenAPI spec validation Spec validation was failing on Jenkins. I am enabling it in this PR to figure out if we can get it pass. No review is necessary until all test passes.

Merge pull request #34643 from mbohlool/h2o
98a2808b · Kubernetes Submit Queue · GitHub · 36d593c7 · c3d9d9a5 · 98a2808b
Commit 98a2808b authored Dec 07, 2016 by Kubernetes Submit Queue Committed by GitHub Dec 07, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 11 deletions

master_test.go pkg/master/master_test.go +4 -11

No files found.
--- a/pkg/master/master_test.go
+++ b/pkg/master/master_test.go
@@ -353,21 +353,14 @@ func TestValidOpenAPISpec(t *testing.T) {
 		assert.NoError(res.AsError())
 	}
-	// TODO(mehdy): The actual validation part of these tests are timing out on jerkin but passing locally. Enable it after debugging timeout issue.
-	disableValidation := true
 	// Validate OpenApi spec
 	doc, err := loads.Spec(server.URL + "/swagger.json")
 	if assert.NoError(err) {
 		validator := validate.NewSpecValidator(doc.Schema(), strfmt.Default)
-		if !disableValidation {
+		res, warns := validator.Validate(doc)
-			res, warns := validator.Validate(doc)
+		assert.NoError(res.AsError())
-			assert.NoError(res.AsError())
+		if !warns.IsValid() {
-			if !warns.IsValid() {
+			t.Logf("Open API spec on root has some warnings : %v", warns)
-				t.Logf("Open API spec on root has some warnings : %v", warns)
-			}
-		} else {
-			t.Logf("Validation is disabled because it is timing out on jenkins put passing locally.")
 		}
 	}
 }