yudaike/openSUSE-release-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #249 from aplanas/master

Browse Source 
Fix tests. And makes staging.get_open_requests NonFree care of.
This commit is contained in:
Stephan Kulow 2014-09-22 18:09:17 +02:00
commit 6f645341de
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osclib/stagingapi.py
View File

@ -320,8 +320,10 @@ class StagingAPI(object):
# xpath query, using the -m, -r, -s options # xpath query, using the -m, -r, -s options
where = "@by_group='factory-staging'+and+@state='new'" where = "@by_group='factory-staging'+and+@state='new'"
target = "@project='openSUSE:{}'".format(self.opensuse) target = "@project='openSUSE:{}'".format(self.opensuse)
target_nf = "@project='openSUSE:{}:NonFree'".format(self.opensuse)
query = "match=state/@name='review'+and+review[{}]+and+target[{}]".format(where, target) query = "match=state/@name='review'+and+review[{}]+and+(target[{}]+or+target[{}])".format(
where, target, target_nf)
url = self.makeurl(['search', 'request'], query) url = self.makeurl(['search', 'request'], query)
f = http_GET(url) f = http_GET(url)
root = ET.parse(f).getroot() root = ET.parse(f).getroot()

4
tests/obs.py
View File

@ -664,8 +664,8 @@ class OBS(object):
"""Return a search result for /search/request.""" """Return a search result for /search/request."""
query = urlparse.urlparse(uri).query query = urlparse.urlparse(uri).query
assert query in ( assert query in (
"match=state/@name='review'+and+review[@by_group='factory-staging'+and+@state='new']+and+target[@project='openSUSE:Factory']", "match=state/@name='review'+and+review[@by_group='factory-staging'+and+@state='new']+and+(target[@project='openSUSE:Factory']+or+target[@project='openSUSE:Factory:NonFree'])",
"match=state/@name='review'+and+review[@by_user='factory-repo-checker'+and+@state='new']+and+target[@project='openSUSE:Factory']" "match=state/@name='review'+and+review[@by_user='factory-repo-checker'+and+@state='new']+and+(target[@project='openSUSE:Factory']+or+target[@project='openSUSE:Factory:NonFree'])"
) )
response = (404, headers, '<result>Not found</result>') response = (404, headers, '<result>Not found</result>')