arg, forgot to save changes in other files

Author: sjanssen2

qiita_db/handlers/tests/test_plugin.py

@@ -18,7 +18,7 @@
 
 class UtilTests(TestCase):
     def test_get_plugin(self):
-        obs = _get_plugin("QIIME", "1.9.1")
+        obs = _get_plugin("QIIMEq2", "1.9.1")
         exp = qdb.software.Software(1)
         self.assertEqual(obs, exp)
 
@@ -27,7 +27,7 @@ def test_get_plugin(self):
             _get_plugin("QiIME", "1.9.1")
 
     def test_get_command(self):
-        obs = _get_command('QIIME', '1.9.1', 'Split libraries FASTQ')
+        obs = _get_command('QIIMEq2', '1.9.1', 'Split libraries FASTQ')
         exp = qdb.software.Command(1)
         self.assertEqual(obs, exp)
 
@@ -38,18 +38,18 @@ def test_get_command(self):
 
 class PluginHandlerTests(OauthTestingBase):
     def test_get_plugin_does_not_exist(self):
-        obs = self.get('/qiita_db/plugins/QIIME/1.9.0/', headers=self.header)
+        obs = self.get('/qiita_db/plugins/QIIMEq2/1.9.0/', headers=self.header)
         self.assertEqual(obs.code, 404)
 
     def test_get_no_header(self):
-        obs = self.get('/qiita_db/plugins/QIIME/1.9.0/')
+        obs = self.get('/qiita_db/plugins/QIIMEq2/1.9.0/')
         self.assertEqual(obs.code, 400)
 
     def test_get(self):
-        obs = self.get('/qiita_db/plugins/QIIME/1.9.1/', headers=self.header)
+        obs = self.get('/qiita_db/plugins/QIIMEq2/1.9.1/', headers=self.header)
         self.assertEqual(obs.code, 200)
         exp = {
-            'name': 'QIIME',
+            'name': 'QIIMEq2',
             'version': '1.9.1',
             'description': 'Quantitative Insights Into Microbial Ecology '
                            '(QIIME) is an open-source bioinformatics pipeline '
@@ -125,12 +125,12 @@ def test_get_command_does_not_exist(self):
 
     def test_get_no_header(self):
         obs = self.get(
-            '/qiita_db/plugins/QIIME/1.9.1/commands/Split%20libraries/')
+            '/qiita_db/plugins/QIIMEq2/1.9.1/commands/Split%20libraries/')
         self.assertEqual(obs.code, 400)
 
     def test_get(self):
         obs = self.get(
-            '/qiita_db/plugins/QIIME/1.9.1/commands/Split%20libraries/',
+            '/qiita_db/plugins/QIIMEq2/1.9.1/commands/Split%20libraries/',
             headers=self.header)
         self.assertEqual(obs.code, 200)
         exp = {'name': 'Split libraries',
@@ -195,20 +195,20 @@ def test_get(self):
 
 class CommandActivateHandlerTests(OauthTestingBase):
     def test_post_command_does_not_exist(self):
-        obs = self.post('/qiita_db/plugins/QIIME/1.9.1/commands/'
+        obs = self.post('/qiita_db/plugins/QIIMEq2/1.9.1/commands/'
                         'UNKNOWN/activate/',
                         headers=self.header, data={})
         self.assertEqual(obs.code, 404)
 
     def test_post_no_header(self):
-        obs = self.post('/qiita_db/plugins/QIIME/1.9.1/commands/'
+        obs = self.post('/qiita_db/plugins/QIIMEq2/1.9.1/commands/'
                         'Split%20libraries/activate/', data={})
         self.assertEqual(obs.code, 400)
 
     def test_post(self):
         qdb.software.Software.deactivate_all()
         self.assertFalse(qdb.software.Command(2).active)
-        obs = self.post('/qiita_db/plugins/QIIME/1.9.1/commands/'
+        obs = self.post('/qiita_db/plugins/QIIMEq2/1.9.1/commands/'
                         'Split%20libraries/activate/', headers=self.header,
                         data={})
         self.assertEqual(obs.code, 200)

qiita_db/handlers/tests/test_processing_job.py

@@ -277,7 +277,8 @@ class ProcessingJobAPItestHandlerTests(OauthTestingBase):
     def test_post_processing_job(self):
         data = {
             'user': '[email protected]',
-            'command': dumps(['QIIME', '1.9.1', 'Pick closed-reference OTUs']),
+            'command': dumps(['QIIMEq2', '1.9.1',
+                              'Pick closed-reference OTUs']),
             'parameters': dumps({"reference": 1,
                                  "sortmerna_e_value": 1,
                                  "sortmerna_max_pos": 10000,
@@ -298,7 +299,8 @@ def test_post_processing_job(self):
     def test_post_processing_job_status(self):
         data = {
             'user': '[email protected]',
-            'command': dumps(['QIIME', '1.9.1', 'Pick closed-reference OTUs']),
+            'command': dumps(['QIIMEq2', '1.9.1',
+                              'Pick closed-reference OTUs']),
             'status': 'running',
             'parameters': dumps({"reference": 1,
                                  "sortmerna_e_value": 1,

qiita_db/test/test_artifact.py

@@ -472,7 +472,7 @@ def test_merging_scheme(self):
                           'QIIMEq2 v1.9.1'))
         self.assertEqual(qdb.artifact.Artifact(5).merging_scheme,
                          ('Pick closed-reference OTUs | Split libraries FASTQ',
-                          'QIIME v1.9.1'))
+                          'QIIMEq2 v1.9.1'))
 
     def test_jobs(self):
         # Returning all jobs

qiita_db/test/test_meta_util.py

@@ -465,15 +465,15 @@ def test_generate_biom_and_metadata_release(self):
             'processed_data/1_study_1001_closed_reference_otu_table.biom\t'
             '%s\t%s\t4\tIllumina\t16S rRNA\t'
             'Pick closed-reference OTUs | Split libraries FASTQ\t'
-            'QIIME v1.9.1\tQIIME v1.9.1\n' % (fn_sample, fn_prep),
+            'QIIMEq2 v1.9.1\tQIIMEq2 v1.9.1\n' % (fn_sample, fn_prep),
             'processed_data/1_study_1001_closed_reference_otu_table.biom\t'
             '%s\t%s\t5\tIllumina\t16S rRNA\t'
             'Pick closed-reference OTUs | Split libraries FASTQ\t'
-            'QIIME v1.9.1\tQIIME v1.9.1\n' % (fn_sample, fn_prep),
+            'QIIMEq2 v1.9.1\tQIIMEq2 v1.9.1\n' % (fn_sample, fn_prep),
             'processed_data/1_study_1001_closed_reference_otu_table_Silva.bio'
             'm\t%s\t%s\t6\tIllumina\t16S rRNA\t'
             'Pick closed-reference OTUs | Split libraries FASTQ'
-            '\tQIIME v1.9.1\tQIIME v1.9.1' % (fn_sample, fn_prep)]
+            '\tQIIMEq2 v1.9.1\tQIIMEq2 v1.9.1' % (fn_sample, fn_prep)]
         self.assertEqual(txt_obs, txt_exp)
 
         # returning configuration

qiita_db/test/test_software.py

@@ -711,18 +711,18 @@ def test_from_file(self):
         self._clean_up_files.append(fp)
         with open(fp, 'w') as f:
             f.write(CONF_TEMPLATE %
-                    ('QIIME', '1.9.1', 'Different description',
+                    ('QIIMEq2', '1.9.1', 'Different description',
                      'source activate qiime', 'start_qiime',
                      'artifact transformation',
                      '[["10.1038/nmeth.f.303", "20383131"]]', client_id,
                      client_secret))
         with warnings.catch_warnings(record=True) as warns:
             obs = qdb.software.Software.from_file(fp)
             obs_warns = [str(w.message) for w in warns]
-            exp_warns = ['Plugin "QIIME" version "1.9.1" config file does not '
-                         'match with stored information. Check the config file'
-                         ' or run "qiita plugin update" to update the plugin '
-                         'information. Offending values: description, '
+            exp_warns = ['Plugin "QIIMEq2" version "1.9.1" config file does '
+                         'not match with stored information. Check the config '
+                         'file or run "qiita plugin update" to update the '
+                         'plugin information. Offending values: description, '
                          'environment_script, start_script']
             self.assertCountEqual(obs_warns, exp_warns)