Merge lp:~allenap/gwacl/extend-azure-error into lp:gwacl

[Gavin Panella]

Ensure that extendError() treats AzureError specially too.

[Raphaël Badin (rvb)]

Looks good!

review: Approve

=== modified file 'httperror.go'
--- httperror.go	2013-07-09 20:01:18 +0000
+++ httperror.go	2013-07-11 10:55:34 +0000
@@ -103,9 +103,13 @@
 func extendError(err error, message string) error {
     switch err := err.(type) {
     case *ServerError:
-        returnedErr := *err
-        returnedErr.error = fmt.Errorf(message+"%v", err.error)
-        return &returnedErr
+        extendedError := *err
+        extendedError.error = fmt.Errorf(message+"%v", err.error)
+        return &extendedError
+    case *AzureError:
+        extendedError := *err
+        extendedError.error = fmt.Errorf(message+"%v", err.error)
+        return &extendedError
     default:
         return fmt.Errorf(message+"%v", err)
     }

=== modified file 'httperror_test.go'
--- httperror_test.go	2013-07-09 20:01:18 +0000
+++ httperror_test.go	2013-07-11 10:55:34 +0000
@@ -104,18 +104,29 @@
 }
 
 func (suite *httpErrorSuite) TestExtendErrorExtendsServerError(c *C) {
-    description := "could not talk to server"
-    status := http.StatusGatewayTimeout
-    httpErr := newHTTPError(status, []byte{}, description)
+    err := &ServerError{
+        error:      errors.New("could not talk to server"),
+        HTTPStatus: HTTPStatus(http.StatusGatewayTimeout),
+    }
+    additionalErrorMsg := "additional message: "
+    newError := extendError(err, additionalErrorMsg)
+    newServerError, ok := newError.(*ServerError)
+    c.Assert(ok, Equals, true)
+    c.Check(newError.Error(), Equals, additionalErrorMsg+err.Error())
+    c.Check(newServerError.HTTPStatus, Equals, err.HTTPStatus)
+}
 
-    httpServerErr, ok := httpErr.(*ServerError)
-    c.Assert(ok, Equals, true)
-    additionalErrorMsg := "additional message"
-    newError := extendError(httpErr, additionalErrorMsg)
-    newServerError, ok := httpErr.(*ServerError)
-    c.Assert(ok, Equals, true)
-    c.Check(newError.Error(), Equals, fmt.Sprintf("%s%s", additionalErrorMsg, httpErr.Error()))
-    c.Check(httpServerErr.HTTPStatus, Equals, newServerError.HTTPStatus)
+func (suite *httpErrorSuite) TestExtendErrorExtendsAzureError(c *C) {
+    err := &AzureError{
+        error:      errors.New("could not talk to server"),
+        HTTPStatus: HTTPStatus(http.StatusGatewayTimeout),
+    }
+    additionalErrorMsg := "additional message: "
+    newError := extendError(err, additionalErrorMsg)
+    newAzureError, ok := newError.(*AzureError)
+    c.Assert(ok, Equals, true)
+    c.Check(newError.Error(), Equals, additionalErrorMsg+err.Error())
+    c.Check(newAzureError.HTTPStatus, Equals, err.HTTPStatus)
 }
 
 func (suite *httpErrorSuite) TestIsNotFound(c *C) {