Only test when non-zero

Author: SimonRichardson

httptesting/http.go

@@ -166,7 +166,7 @@ type DoRequestParams struct {
 	ExpectError string
 
 	// ExpectStatus holds the expected HTTP status code.
-	// http.StatusOK is assumed if this is zero.
+	// If unset or zero, then no check is performed.
 	ExpectStatus int
 
 	// Method holds the HTTP method to use for the call.
@@ -280,14 +280,9 @@ func Do(c *gc.C, p DoRequestParams) *http.Response {
 		return nil
 	}
 	c.Assert(err, jc.ErrorIsNil)
-	// Check the status even if the expected status is zero.
-	// This should ensure that the server is responding correctly,
-	// or at least your tests are.
-	expectedStatus := p.ExpectStatus
-	if expectedStatus == 0 {
-		expectedStatus = http.StatusOK
+	if p.ExpectStatus != 0 {
+		c.Assert(resp.StatusCode, gc.Equals, p.ExpectStatus)
 	}
-	c.Assert(resp.StatusCode, gc.Equals, expectedStatus)
 	return resp
 }