commit 9e302eaaca5ce78871d0cda8bde1e586f48de87a
author Andrey Logvin <landrey@webrtc.org> Wed Nov 18 16:59:57 2020 +0000
committer Commit Bot <commit-bot@chromium.org> Wed Nov 18 18:39:28 2020 +0000
tree a7f3ff222c7fc8ce6ff9aa17eda7785603a498bb
parent 942bf345ed6bf3f946e553bfa28abb437521047c

Fix address of checking the Dashboard upload status

No-Presubmit: True
Bug: webrtc:12162
Change-Id: I11d46550f5f1beb412b5c8911d6864ab8eaac114
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/194001
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Andrey Logvin <landrey@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32634}

tools_webrtc/perf/catapult_uploader.py

diff --git a/tools_webrtc/perf/catapult_uploader.py b/tools_webrtc/perf/catapult_uploader.py
index 81e6583..7ecdf32 100644
--- a/tools_webrtc/perf/catapult_uploader.py
+++ b/tools_webrtc/perf/catapult_uploader.py
@@ -93,15 +93,16 @@
             time.sleep((next_poll_time - current_time).total_seconds())
         next_poll_time = datetime.datetime.now() + wait_polling_period
 
-        response, content = http.request(url + '/uploads' + upload_token,
+        response, content = http.request(url + '/uploads/' + upload_token,
                                          method='GET', headers=headers)
 
         print 'Upload state polled. Response: %r.' % content
 
+        if response.status != 200:
+            break
+
         resp_json = json.loads(content)
-        if (response.status != 200 or
-            resp_json['state'] == 'COMPLETED' or
-            resp_json['state'] == 'FAILED'):
+        if resp_json['state'] == 'COMPLETED' or resp_json['state'] == 'FAILED':
             break
 
     return response, resp_json