Skip to content

Commit b7e2cc9

Browse files
committed
Fixing test and remove debug code
1 parent eae20cc commit b7e2cc9

File tree

2 files changed

+4
-32
lines changed

2 files changed

+4
-32
lines changed

qiita_db/test/test_util.py

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -854,7 +854,7 @@ def test_get_artifacts_information(self):
854854
{'files': ['1_study_1001_closed_reference_otu_table.biom'],
855855
'target_subfragment': ['V4'], 'artifact_id': 4,
856856
'algorithm': ('Pick closed-reference OTUs, QIIMEv1.9.1 |'
857-
' Defaults'),
857+
' barcode_type 8, defaults'),
858858
'data_type': '18S', 'prep_samples': 27,
859859
'parameters': {
860860
'reference': 1, 'similarity': 0.97, 'sortmerna_e_value': 1,
@@ -866,18 +866,6 @@ def test_get_artifacts_information(self):
866866
{'files': ['biom_table.biom'], 'target_subfragment': [],
867867
'algorithm': '', 'artifact_id': 8, 'data_type': '18S',
868868
'prep_samples': 0, 'parameters': {}, 'name': 'noname'}]
869-
print len(obs), len(exp)
870-
for o, e in zip(obs, exp):
871-
if o != e:
872-
print o
873-
print e
874-
print "---------------"
875-
for k in o:
876-
if o[k] != e[k]:
877-
print k
878-
print o[k]
879-
print e[k]
880-
print "==============="
881869
self.assertItemsEqual(obs, exp)
882870

883871

qiita_pet/handlers/study_handlers/tests/test_artifact.py

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,8 @@ def test_get(self):
167167
'target_subfragment': ['V4'], 'artifact_id': 6,
168168
'data_type': '16S', 'timestamp': '2012-10-02 17:30:00',
169169
'prep_samples': 27,
170-
'algorithm': 'Pick closed-reference OTUs, QIIMEv1.9.1 | Defaults',
170+
'algorithm': 'Pick closed-reference OTUs, QIIMEv1.9.1 | '
171+
'barcode_type 8, defaults',
171172
'parameters': {
172173
'reference': 2, 'similarity': 0.97, 'sortmerna_e_value': 1,
173174
'sortmerna_max_pos': 10000, 'input_data': 2, 'threads': 1,
@@ -181,24 +182,7 @@ def test_get(self):
181182
self.assertItemsEqual(obs.keys(), exp.keys())
182183
self.assertEqual(obs['status'], exp['status'])
183184
self.assertEqual(obs['msg'], exp['msg'])
184-
185-
obs = obs['data']
186-
exp = exp['data']
187-
print len(obs), len(exp)
188-
for o, e in zip(obs, exp):
189-
if o != e:
190-
print o
191-
print e
192-
print "---------------"
193-
for k in o:
194-
if o[k] != e[k]:
195-
print k
196-
print o[k]
197-
print e[k]
198-
print "==============="
199-
200-
# self.assertItemsEqual(obs['data'], exp['data'])
201-
self.assertItemsEqual(obs, exp)
185+
self.assertItemsEqual(obs['data'], exp['data'])
202186

203187

204188
class ArtifactAdminAJAXTestsReadOnly(TestHandlerBase):

0 commit comments

Comments
 (0)