Skip to content

Http400 fixes #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xfade merged 3 commits into from
Nov 9, 2017
Merged

Http400 fixes #3

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ba7a53
Handle HTTP400 in getServiceState
keto Oct 20, 2017
6cf1078
Handle failed service HTTP 400 in getPackageChecksum / hasChanges
keto Nov 8, 2017
262637a
Handle HTTP 400 in addReview
keto Nov 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 32 additions & 8 deletions buildservice/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

import os
import re
import tempfile
import time
import urlparse
import urllib2
import cgi
import xml.etree.cElementTree as ElementTree
Expand Down Expand Up @@ -972,16 +972,22 @@ def getPackageChecksum(self, project, package, rev=None):
"""
getPackageChecksum(self, project, package, rev=None) -> string

returns source md5 of a package
returns source md5 of a package or None if it can't be determined atm
"""
query = { 'expand' : 1 }
if rev:
query['rev'] = rev
else:
query['rev'] = 'latest'

u = core.makeurl(self.apiurl, ['source', project, package], query=query)
f = core.http_GET(u)
try:
f = core.http_GET(u)
except HTTPError as e:
if e.code == 400 and re.match('service .+ failed', e.reason):
return None
else:
raise
root = ElementTree.parse(f).getroot()
return root.get("srcmd5")

Expand Down Expand Up @@ -1078,8 +1084,19 @@ def getPackageRev(self, project, pkg):
return tree.get("rev")

def getServiceState(self, project, pkg):
xml = core.show_files_meta(self.apiurl, project, pkg, expand=True)
tree = ElementTree.fromstring(''.join(xml))
try:
xml = core.show_files_meta(self.apiurl, project, pkg, expand=True)
except HTTPError as e:
# Check the known reasons in 400 response
if e.code == 400:
if 'service in progress' in e.reason:
return 'running'
else:
return e.reason
# Raise other errors
raise

tree = ElementTree.fromstring(''.join(xml))
status = "succeeded"
for node in tree.findall("serviceinfo"):
status = node.get("code")
Expand Down Expand Up @@ -1142,8 +1159,15 @@ def addReview(self, rid, msg, reviewer):
by_type = "by_%s" % reviewer_type
query = {'cmd': 'addreview', by_type : reviewer }
u = core.makeurl(self.apiurl, ['request', rid], query=query)
f = core.http_POST(u, data=msg)
root = ElementTree.parse(f).getroot()
try:
f = core.http_POST(u, data=msg)
root = ElementTree.parse(f).getroot()
except HTTPError as e:
if e.code == 400:
root = ElementTree.parse(e).getroot()
else:
raise

ret = root.get('code')
if ret == "ok":
return True
Expand Down