From 5790cdf1e494eb23a4ddf8a6a56eaedad2fc61af Mon Sep 17 00:00:00 2001 From: Alberto Planas Date: Mon, 22 Sep 2014 17:56:35 +0200 Subject: [PATCH] Fix tests --- osclib/stagingapi.py | 4 +++- tests/obs.py | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/osclib/stagingapi.py b/osclib/stagingapi.py index 349746d6..cd783c3b 100644 --- a/osclib/stagingapi.py +++ b/osclib/stagingapi.py @@ -320,8 +320,10 @@ class StagingAPI(object): # xpath query, using the -m, -r, -s options where = "@by_group='factory-staging'+and+@state='new'" 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) f = http_GET(url) root = ET.parse(f).getroot() diff --git a/tests/obs.py b/tests/obs.py index a03d9d08..3cc116b8 100644 --- a/tests/obs.py +++ b/tests/obs.py @@ -664,8 +664,8 @@ class OBS(object): """Return a search result for /search/request.""" query = urlparse.urlparse(uri).query 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_user='factory-repo-checker'+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']+or+target[@project='openSUSE:Factory:NonFree'])" ) response = (404, headers, 'Not found')