Return raw response on ReceivePush

To match Request behaviour so we can also build a NewExpectError

bot/pitaya_client.go

@@ -164,20 +164,20 @@ func (c *PClient) Notify(route string, data []byte) error {
 }
 
 // ReceivePush ...
-func (c *PClient) ReceivePush(route string, timeout int) (Response, error) {
+func (c *PClient) ReceivePush(route string, timeout int) (Response, []byte, error) {
 	ch := c.getPushChannelForRoute(route)
 
 	select {
 	case data := <-ch:
 		var ret Response
 		if err := json.Unmarshal(data, &ret); err != nil {
 			err = fmt.Errorf("Error unmarshaling response: %s", err)
-			return nil, err
+			return nil, nil, err
 		}
 
-		return ret, nil
+		return ret, data, nil
 	case <-time.After(time.Duration(timeout) * time.Millisecond):
-		return nil, fmt.Errorf("Timeout waiting for push on route %s", route)
+		return nil, nil, fmt.Errorf("Timeout waiting for push on route %s", route)
 	}
 }
 

bot/sequential.go

@@ -171,15 +171,15 @@ func (b *SequentialBot) runFunction(op *models.Operation) error {
 
 func (b *SequentialBot) listenToPush(op *models.Operation) error {
 	b.logger.Debug("Waiting for push on route: " + op.URI)
-	resp, err := b.client.ReceivePush(op.URI, op.Timeout)
+	resp, rawResp, err := b.client.ReceivePush(op.URI, op.Timeout)
 	if err != nil {
 		return err
 	}
 
 	b.logger.Debug("validating expectations")
 	err = validateExpectations(op.Expect, resp, b.storage)
 	if err != nil {
-		return err
+		return NewExpectError(err, rawResp, op.Expect)
 	}
 	b.logger.Debug("received valid response")