From: Zack Cerza <zack@redhat.com>
Date: Wed, 21 Sep 2016 23:18:58 +0000 (-0600)
Subject: ShamanProject: split out search URI generation
X-Git-Tag: 1.1.0~522^2~3
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=82d1118352e372855ab58ca39eafcaee532e3346;p=teuthology.git

ShamanProject: split out search URI generation

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/teuthology/packaging.py b/teuthology/packaging.py
index d4985c4dd2..cc02a3a540 100644
--- a/teuthology/packaging.py
+++ b/teuthology/packaging.py
@@ -773,6 +773,17 @@ class ShamanProject(GitbuilderProject):
         return self._result_obj
 
     def _search(self):
+        uri = self._search_uri
+        log.debug("Querying %s", uri)
+        resp = requests.get(
+            uri,
+            headers={'content-type': 'application/json'},
+        )
+        resp.raise_for_status()
+        return resp
+
+    @property
+    def _search_uri(self):
         flavor = self.flavor
         if flavor == 'basic':
             flavor = 'default'
@@ -790,13 +801,7 @@ class ShamanProject(GitbuilderProject):
             self.query_url,
             'search',
         ) + '?%s' % req_str
-        log.debug("Querying %s", uri)
-        resp = requests.get(
-            uri,
-            headers={'content-type': 'application/json'},
-        )
-        resp.raise_for_status()
-        return resp
+        return uri
 
     def assert_result(self):
         if len(self._result.json()) == 0: