Merge pull request #45 from antgonza/add-QIITA_PORT

add QIITA_PORT

Author: charles-cowart

qiita_client/qiita_client.py

@@ -88,7 +88,10 @@ def _heartbeat(qclient, url):
             # This error occurs when the Qiita server is not reachable. This
             # may occur when we are updating the server, and we don't want
             # the job to fail. In this case, we wait for 5 min and try again
-            time.sleep(randint(MIN_TIME_SLEEP, MAX_TIME_SLEEP))
+            stime = randint(MIN_TIME_SLEEP, MAX_TIME_SLEEP)
+            logger.debug('retry _heartbeat() %d, %d, %s' % (
+                retries, stime, url))
+            time.sleep(stime)
             retries -= 1
         except QiitaClientError:
             # If we raised the error, we propagate it since it is a problem
@@ -261,7 +264,11 @@ def _request_oauth2(self, req, *args, **kwargs):
             except requests.ConnectionError:
                 if retries <= 0:
                     raise
-                time.sleep(randint(MIN_TIME_SLEEP, MAX_TIME_SLEEP))
+                stime = randint(MIN_TIME_SLEEP, MAX_TIME_SLEEP)
+                logger.debug(
+                    'retry QiitaClient._request_oauth2() %d, %d' % (
+                        retries, stime))
+                time.sleep(stime)
                 retries -= 1
         if r.status_code == 400:
             try:
@@ -347,7 +354,10 @@ def _request_retry(self, req, url, **kwargs):
                     return r.json()
                 except ValueError:
                     return None
-            time.sleep(randint(MIN_TIME_SLEEP, MAX_TIME_SLEEP))
+            stime = randint(MIN_TIME_SLEEP, MAX_TIME_SLEEP)
+            logger.debug('retry QiitaClient._request_retry() %d, %d, %s' % (
+                retries, stime, url))
+            time.sleep(stime)
 
         raise RuntimeError(
             "Request '%s %s' did not succeed. Status code: %d. Message: %s"

qiita_client/testing.py

@@ -25,9 +25,10 @@ def setUpClass(cls):
         cls.client_secret = ('J7FfQ7CQdOxuKhQAf1eoGgBAE81Ns8Gu3EKaWFm3IO2JKh'
                              'AmmCWZuabe0O5Mp28s1')
         cls.server_cert = environ.get('QIITA_SERVER_CERT', None)
-        cls.qclient = QiitaClient("https://localhost:21174", cls.client_id,
-                                  cls.client_secret,
-                                  server_cert=cls.server_cert)
+        qiita_port = int(environ.get('QIITA_PORT', 21174))
+        cls.qclient = QiitaClient(
+            "https://localhost:%d" % qiita_port, cls.client_id,
+            cls.client_secret, server_cert=cls.server_cert)
         logger.debug(
             'PluginTestCase.setUpClass() token %s' % cls.qclient._token)
         cls.qclient.post('/apitest/reload_plugins/')