Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions qiita_db/handlers/tests/test_processing_job.py
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ def setUp(self):
super(CompleteHandlerTests, self).setUp()

def tearDown(self):
super(CompleteHandlerTests, self).tearDown()
for fp in self._clean_up_files:
if exists(fp):
remove(fp)
Expand Down
5 changes: 3 additions & 2 deletions qiita_db/metadata_template/base_metadata_template.py
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,8 @@ def _clean_validate_template(cls, md_template, study_id, restriction_dict,

if missing:
warning_msg.append(
"%s: %s" % (restriction.error_msg, ', '.join(missing)))
"%s: %s" % (restriction.error_msg,
', '.join(sorted(missing))))

if warning_msg:
warnings.warn(
Expand Down Expand Up @@ -712,7 +713,7 @@ def _common_extend_steps(self, md_template):
if new_cols:
warnings.warn(
"The following columns have been added to the existing"
" template: %s" % ", ".join(new_cols),
" template: %s" % ", ".join(sorted(new_cols)),
qdb.exceptions.QiitaDBWarning)
# If we are adding new columns, add them first (simplifies
# code). Sorting the new columns to enforce an order
Expand Down
3 changes: 2 additions & 1 deletion qiita_db/metadata_template/prep_template.py
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,8 @@ def create_qiime_mapping_file(self):
"Some columns required to generate a QIIME-compliant "
"mapping file are not present in the template. A "
"placeholder value (XXQIITAXX) has been used to populate "
"these columns. Missing columns: %s" % ', '.join(missing),
"these columns. Missing columns: %s"
% ', '.join(sorted(missing)),
qdb.exceptions.QiitaDBWarning)

# Gets the orginal mapping columns and readjust the order to comply
Expand Down
6 changes: 3 additions & 3 deletions qiita_db/test/test_analysis.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
from os.path import exists, join
from datetime import datetime
from shutil import move
import warnings

from future.utils import viewitems
from biom import load_table
Expand Down Expand Up @@ -321,8 +320,9 @@ def test_retrieve_dropped_samples(self):
'SKB7.640196': {'barcode': 'AAAAAAAAAAAG'}},
orient='index')

warnings.simplefilter('ignore', qdb.exceptions.QiitaDBWarning)
pt = qdb.metadata_template.prep_template.PrepTemplate.create(
pt = npt.assert_warns(
qdb.exceptions.QiitaDBWarning,
qdb.metadata_template.prep_template.PrepTemplate.create,
metadata, study, "16S")

mp = qdb.util.get_mountpoint("processed_data")[0][1]
Expand Down
1,064 changes: 526 additions & 538 deletions qiita_db/test/test_artifact.py

Large diffs are not rendered by default.

Loading