Skip to content

Commit 6a9c2f9

Browse files
committed
more renaming of QIIME to QIIMEq2 for qiita_db tests
1 parent 5c019f5 commit 6a9c2f9

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

qiita_db/test/test_artifact.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ def test_merging_scheme(self):
469469
('Split libraries FASTQ | N/A', 'N/A'))
470470
self.assertEqual(qdb.artifact.Artifact(4).merging_scheme,
471471
('Pick closed-reference OTUs | Split libraries FASTQ',
472-
'QIIME v1.9.1'))
472+
'QIIMEq2 v1.9.1'))
473473
self.assertEqual(qdb.artifact.Artifact(5).merging_scheme,
474474
('Pick closed-reference OTUs | Split libraries FASTQ',
475475
'QIIME v1.9.1'))

qiita_db/test/test_meta_util.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -381,15 +381,15 @@ def test_generate_biom_and_metadata_release(self):
381381
'processed_data/1_study_1001_closed_reference_otu_table.biom\t'
382382
'%s\t%s\t4\tIllumina\t16S rRNA\t'
383383
'Pick closed-reference OTUs | Split libraries FASTQ\t'
384-
'QIIME v1.9.1\tQIIME v1.9.1\n' % (fn_sample, fn_prep),
384+
'QIIMEq2 v1.9.1\tQIIMEq2 v1.9.1\n' % (fn_sample, fn_prep),
385385
'processed_data/1_study_1001_closed_reference_otu_table.biom\t'
386386
'%s\t%s\t5\tIllumina\t16S rRNA\t'
387387
'Pick closed-reference OTUs | Split libraries FASTQ\t'
388-
'QIIME v1.9.1\tQIIME v1.9.1\n' % (fn_sample, fn_prep),
388+
'QIIMEq2 v1.9.1\tQIIMEq2 v1.9.1\n' % (fn_sample, fn_prep),
389389
'processed_data/1_study_1001_closed_reference_otu_table_Silva.bio'
390390
'm\t%s\t%s\t6\tIllumina\t16S rRNA\t'
391391
'Pick closed-reference OTUs | Split libraries FASTQ\t'
392-
'QIIME v1.9.1\tQIIME v1.9.1' % (fn_sample, fn_prep)]
392+
'QIIMEq2 v1.9.1\tQIIMEq2 v1.9.1' % (fn_sample, fn_prep)]
393393
self.assertEqual(txt_obs, txt_exp)
394394

395395
# whatever the configuration was, we will change to settings so we can

qiita_db/test/test_software.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ def test_create_error(self):
342342
self.outputs)
343343

344344
# the output type doesn't exist
345-
with self.assertRaisesRegex(ValueError, "Error creating QIIME, Split "
345+
with self.assertRaisesRegex(ValueError, "Error creating QIIMEq2, Split "
346346
"libraries - wrong output, This is a "
347347
"command for testing - Unknown "
348348
"artifact_type: BLA!"):
@@ -567,7 +567,7 @@ def tearDown(self):
567567
remove(f)
568568

569569
def test_from_name_and_version(self):
570-
obs = qdb.software.Software.from_name_and_version('QIIME', '1.9.1')
570+
obs = qdb.software.Software.from_name_and_version('QIIMEq2', '1.9.1')
571571
exp = qdb.software.Software(1)
572572
self.assertEqual(obs, exp)
573573

@@ -578,13 +578,13 @@ def test_from_name_and_version(self):
578578

579579
# Wrong name
580580
with self.assertRaises(qdb.exceptions.QiitaDBUnknownIDError):
581-
qdb.software.Software.from_name_and_version('QiIME', '1.9.1')
581+
qdb.software.Software.from_name_and_version('QiIMEq2', '1.9.1')
582582
# Wrong version
583583
with self.assertRaises(qdb.exceptions.QiitaDBUnknownIDError):
584-
qdb.software.Software.from_name_and_version('QIIME', '1.9.0')
584+
qdb.software.Software.from_name_and_version('QIIMEq2', '1.9.0')
585585

586586
def test_name(self):
587-
self.assertEqual(qdb.software.Software(1).name, "QIIME")
587+
self.assertEqual(qdb.software.Software(1).name, "QIIMEq2")
588588

589589
def test_version(self):
590590
self.assertEqual(qdb.software.Software(1).version, "1.9.1")
@@ -694,7 +694,7 @@ def test_from_file(self):
694694
self._clean_up_files.append(fp)
695695
with open(fp, 'w') as f:
696696
f.write(CONF_TEMPLATE %
697-
('QIIME', '1.9.1',
697+
('QIIMEq2', '1.9.1',
698698
'Quantitative Insights Into Microbial Ecology (QIIME) '
699699
'is an open-source bioinformatics pipeline for '
700700
'performing microbiome analysis from raw DNA '
@@ -829,7 +829,7 @@ def test_from_file(self):
829829
self.assertEqual(obs.client_secret, 'client_secret')
830830

831831
def test_exists(self):
832-
self.assertTrue(qdb.software.Software.exists("QIIME", "1.9.1"))
832+
self.assertTrue(qdb.software.Software.exists("QIIMEq2", "1.9.1"))
833833
self.assertFalse(qdb.software.Software.exists("NewPlugin", "1.9.1"))
834834
self.assertFalse(qdb.software.Software.exists("QIIME", "2.0.0"))
835835

0 commit comments

Comments
 (0)