Skip to content

Commit 3995ae8

Browse files
committed
Addressing @adamrp's comments
1 parent df108b9 commit 3995ae8

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

qiita_db/metadata_template/test/test_util.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,9 +239,8 @@ def test_looks_like_qiime_mapping_file(self):
239239
StringIO(QIIME_TUTORIAL_MAP_SUBSET))
240240
self.assertTrue(obs)
241241

242-
def test_looks_like_qiime_mmapping_file_error(self):
243-
with self.assertRaises(QiitaDBError):
244-
looks_like_qiime_mapping_file(StringIO())
242+
obs = looks_like_qiime_mapping_file(StringIO())
243+
self.assertFalse(obs)
245244

246245
def test_parse_mapping_file(self):
247246
# Tests ported over from QIIME

qiita_db/metadata_template/util.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -346,10 +346,6 @@ def looks_like_qiime_mapping_file(fp):
346346
bool
347347
True if fp looks like a QIIME mapping file, false otherwise.
348348
349-
Raises
350-
------
351-
QiitaDBError
352-
If an empty file is passed
353349
354350
Notes
355351
-----
@@ -362,7 +358,7 @@ def looks_like_qiime_mapping_file(fp):
362358
with open_file(fp, mode='U') as f:
363359
first_line = f.readline()
364360
if not first_line:
365-
raise QiitaDBError('Empty file passed!')
361+
return False
366362

367363
first_col = first_line.split()[0]
368364
return first_col == '#SampleID'

0 commit comments

Comments
 (0)