From 0faf82702b442e864f8d9c6a2f6a942a9207c2d8 Mon Sep 17 00:00:00 2001
From: Nick Craig-Wood <nick@craig-wood.com>
Date: Sun, 12 Mar 2017 12:00:10 +0000
Subject: [PATCH] onedrive: fix waitForJob to parse errors correctly #1224

---
 onedrive/onedrive.go | 37 +++++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/onedrive/onedrive.go b/onedrive/onedrive.go
index 0df3e71a9..9b1dd1770 100644
--- a/onedrive/onedrive.go
+++ b/onedrive/onedrive.go
@@ -4,6 +4,7 @@ package onedrive
 
 import (
 	"bytes"
+	"encoding/json"
 	"fmt"
 	"io"
 	"log"
@@ -545,33 +546,41 @@ func (f *Fs) waitForJob(location string, o *Object) error {
 	deadline := time.Now().Add(fs.Config.Timeout)
 	for time.Now().Before(deadline) {
 		opts := rest.Opts{
-			Method:   "GET",
-			Path:     location,
-			Absolute: true,
+			Method:       "GET",
+			Path:         location,
+			Absolute:     true,
+			IgnoreStatus: true, // Ignore the http status response since it seems to return valid info on 500 errors
 		}
 		var resp *http.Response
 		var err error
+		var body []byte
 		err = f.pacer.Call(func() (bool, error) {
 			resp, err = f.srv.Call(&opts)
-			return shouldRetry(resp, err)
+			if err != nil {
+				return fs.ShouldRetry(err), err
+			}
+			body, err = rest.ReadBody(resp)
+			return fs.ShouldRetry(err), err
 		})
 		if err != nil {
 			return err
 		}
-		if resp.StatusCode == 202 {
-			var status api.AsyncOperationStatus
-			err = rest.DecodeJSON(resp, &status)
-			if err != nil {
-				return err
-			}
+		// Try to decode the body first as an api.AsyncOperationStatus
+		var status api.AsyncOperationStatus
+		err = json.Unmarshal(body, &status)
+		if err != nil {
+			return errors.Wrapf(err, "async status result not JSON: %q", body)
+		}
+		// See if we decoded anything...
+		if !(status.Operation == "" && status.PercentageComplete == 0 && status.Status == "") {
 			if status.Status == "failed" || status.Status == "deleteFailed" {
-				return errors.Errorf("async operation %q returned %q", status.Operation, status.Status)
+				return errors.Errorf("%s: async operation %q returned %q", o.remote, status.Operation, status.Status)
 			}
-		} else {
+		} else if resp.StatusCode == 200 {
 			var info api.Item
-			err = rest.DecodeJSON(resp, &info)
+			err = json.Unmarshal(body, &info)
 			if err != nil {
-				return err
+				return errors.Wrapf(err, "async item result not JSON: %q", body)
 			}
 			return o.setMetaData(&info)
 		}