self.ca_cert

Author: antgonza

qiita_client/qiita_client.py

@@ -32,8 +32,8 @@
 # responses from the server so let's make the retries values small
 if logger.level != logging.CRITICAL:
     MAX_RETRIES = 2
-    MIN_TIME_SLEEP = 3
-    MAX_TIME_SLEEP = 10
+    MIN_TIME_SLEEP = 2
+    MAX_TIME_SLEEP = 5
 else:
     MAX_RETRIES = 3
     MIN_TIME_SLEEP = 180

qiita_client/testing.py

@@ -15,7 +15,7 @@
 import logging
 
 logger = logging.getLogger(__name__)
-URL = "https://127.0.0.1:8383"
+URL = "https://localhost:8383"
 
 
 class PluginTestCase(TestCase):
@@ -25,12 +25,12 @@ def setUpClass(cls):
         cls.client_id = '19ndkO3oMKsoChjVVWluF7QkxHRfYhTKSFbAVt8IhK7gZgDaO4'
         cls.client_secret = ('J7FfQ7CQdOxuKhQAf1eoGgBAE81Ns8Gu3EKaWFm3IO2JKh'
                              'AmmCWZuabe0O5Mp28s1')
-        cls.rootca = environ.get('QIITA_ROOTCA_CERT')
+        cls.ca_cert = environ.get('QIITA_ROOTCA_CERT')
 
         # do not rely on defining ca_cert for these tests. Instead append
         # the appropriate CA cert to certifi's pem file.
         cls.qclient = QiitaClient(
-            URL, cls.client_id, cls.client_secret, cls.rootca)
+            URL, cls.client_id, cls.client_secret, cls.ca_cert)
 
         logger.debug(
             'PluginTestCase.setUpClass() token %s' % cls.qclient._token)

qiita_client/tests/test_plugin.py

@@ -16,8 +16,8 @@
 from qiita_client.testing import PluginTestCase
 from qiita_client import (QiitaPlugin, QiitaTypePlugin, QiitaCommand,
                           QiitaArtifactType, ArtifactInfo)
-from .testing import URL
 
+URL = 'https://localhost:21174'
 
 class QiitaCommandTest(TestCase):
     def setUp(self):

qiita_client/tests/test_qiita_client.py

@@ -15,7 +15,7 @@
 
 from qiita_client.qiita_client import (QiitaClient, _format_payload,
                                        ArtifactInfo)
-from qiita_client.testing import PluginTestCase
+from qiita_client.testing import PluginTestCase, URL
 from qiita_client.exceptions import BadRequestError
 
 CLIENT_ID = '19ndkO3oMKsoChjVVWluF7QkxHRfYhTKSFbAVt8IhK7gZgDaO4'
@@ -97,11 +97,9 @@ def test_format_payload_error(self):
 
 class QiitaClientTests(PluginTestCase):
     def setUp(self):
-        self.ca_cert = environ.get('QIITA_ROOT_CA')
-        self.tester = QiitaClient("https://localhost:8383",
+        self.tester = QiitaClient(URL,
                                   CLIENT_ID,
-                                  CLIENT_SECRET,
-                                  self.ca_cert)
+                                  CLIENT_SECRET, self.ca_cert)
         self.clean_up_files = []
 
         # making assertRaisesRegex compatible with Python 2.7 and 3.9
@@ -114,11 +112,11 @@ def tearDown(self):
                 remove(fp)
 
     def test_init(self):
-        obs = QiitaClient("https://localhost:8383",
+        obs = QiitaClient(URL,
                           CLIENT_ID,
                           CLIENT_SECRET,
                           ca_cert=self.ca_cert)
-        self.assertEqual(obs._server_url, "https://localhost:8383")
+        self.assertEqual(obs._server_url, URL)
         self.assertEqual(obs._client_id, CLIENT_ID)
         self.assertEqual(obs._client_secret, CLIENT_SECRET)
         self.assertEqual(obs._verify, self.ca_cert)
@@ -243,13 +241,14 @@ def test_update_job_step_ignore_failure(self):
 
         # confirm that update_job_step behaves as before when ignore_error
         # parameter absent or set to False.
-        self.bad_tester = QiitaClient("https://localhost:8383",
+        self.bad_tester = QiitaClient(URL,
                                       BAD_CLIENT_ID,
                                       CLIENT_SECRET,
                                       self.ca_cert)
 
         with self.assertRaises(BaseException):
-            self.bad_tester.update_job_step(job_id, new_step)
+            self.bad_tester.update_job_step(
+                job_id, new_step, ignore_error=False)
 
         with self.assertRaises(BaseException):
             self.bad_tester.update_job_step(job_id,