installing current version in qiita

Author: antgonza

.github/workflows/qiita-ci.yml

@@ -81,6 +81,12 @@ jobs:
           conda activate qiita_client
           pip --quiet install .
 
+          # Note that the qiita conda environment has installed the qiita_client "master branch"
+          # but to fully test we need to install the current branch of qiita_client
+          conda deactivate
+          conda activate qiita
+          pip --quiet install .
+
       - name: Starting Main Services
         shell: bash -l {0}
         run: |

qiita_client/testing.py

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

qiita_client/tests/test_plugin.py

@@ -16,6 +16,7 @@
 from qiita_client.testing import PluginTestCase
 from qiita_client import (QiitaPlugin, QiitaTypePlugin, QiitaCommand,
                           QiitaArtifactType, ArtifactInfo)
+from .testing import URL
 
 
 class QiitaCommandTest(TestCase):
@@ -173,7 +174,7 @@ def html_generator_func(a, b, c, d):
         self.qclient.post('/apitest/reload_plugins/')
 
         # Install the current plugin
-        tester("https://localhost:8383", 'register', 'ignored')
+        tester(URL, 'register', 'ignored')
 
         # Check that it has been installed
         obs = self.qclient.get('/qiita_db/plugins/NewPlugin/1.0.0/')
@@ -214,7 +215,7 @@ def func(qclient, job_id, job_params, working_dir):
 
         tester.generate_config('ls', 'echo')
         self.qclient.post('/apitest/reload_plugins/')
-        tester("https://localhost:8383", 'register', 'ignored')
+        tester(URL, 'register', 'ignored')
 
         obs = self.qclient.get('/qiita_db/plugins/NewPlugin/0.0.1/')
         self.assertEqual(obs['name'], 'NewPlugin')
@@ -230,7 +231,7 @@ def func(qclient, job_id, job_params, working_dir):
                 'status': 'queued'}
         job_id = self.qclient.post('/apitest/processing_job/',
                                    data=data)['job']
-        tester("https://localhost:8383", job_id, self.outdir)
+        tester(URL, job_id, self.outdir)
 
         status = self._wait_for_running_job(job_id)
         self.assertEqual(status, 'success')

qiita_client/tests/test_qiita_client.py

@@ -97,15 +97,11 @@ def test_format_payload_error(self):
 
 class QiitaClientTests(PluginTestCase):
     def setUp(self):
-        self.ca_cert = environ.get('QIITA_ROOT_CA', None)
+        self.ca_cert = environ.get('QIITA_ROOT_CA')
         self.tester = QiitaClient("https://localhost:8383",
                                   CLIENT_ID,
                                   CLIENT_SECRET,
                                   self.ca_cert)
-        self.bad_tester = QiitaClient("https://localhost:8383",
-                                      BAD_CLIENT_ID,
-                                      CLIENT_SECRET,
-                                      self.ca_cert)
         self.clean_up_files = []
 
         # making assertRaisesRegex compatible with Python 2.7 and 3.9
@@ -247,6 +243,10 @@ 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",
+                                      BAD_CLIENT_ID,
+                                      CLIENT_SECRET,
+                                      self.ca_cert)
 
         with self.assertRaises(BaseException):
             self.bad_tester.update_job_step(job_id, new_step)