Skip to content

Commit 7bfcf25

Browse files
committed
fix errors
1 parent de4f88c commit 7bfcf25

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

qiita_db/processing_job.py

+2
Original file line numberDiff line numberDiff line change
@@ -1386,6 +1386,8 @@ def _complete_artifact_transformation(self, artifacts_data):
13861386

13871387
# Submit m validator jobs as n lists of jobs
13881388
n = qiita_config.job_scheduler_dependency_q_cnt
1389+
if n is None:
1390+
n = 2
13891391

13901392
# taken from:
13911393
# https://www.geeksforgeeks.org/break-list-chunks-size-n-python/

qiita_db/test/test_processing_job.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -870,7 +870,7 @@ def test_notification_mail_generation(self):
870870
# messages of type 'error'.
871871
obs = self.tester1._generate_notification_message('error', None)
872872

873-
exp = {'subject': ('Split libraries FASTQ: queued '
873+
exp = {'subject': ('Split libraries FASTQ: error '
874874
'(063e553b-327c-4818-ab4a-adfe58e49860)'),
875875
'message': ('Processing Job: Split libraries FASTQ\n'
876876
f'{qiita_config.base_url}/study/description/1'
@@ -880,7 +880,7 @@ def test_notification_mail_generation(self):
880880

881881
obs = self.tester1._generate_notification_message('error',
882882
'An Error Message')
883-
exp = {'subject': ('Split libraries FASTQ : error '
883+
exp = {'subject': ('Split libraries FASTQ: error '
884884
'(063e553b-327c-4818-ab4a-adfe58e49860)'),
885885
'message': ('Processing Job: Split libraries FASTQ\n'
886886
f'{qiita_config.base_url}/study/description/1\n'
@@ -891,7 +891,7 @@ def test_notification_mail_generation(self):
891891
# The inclusion of an error message has no effect on other valid
892892
# status types e.g. 'running'.
893893
obs = self.tester1._generate_notification_message('running', None)
894-
exp = {'subject': ('Split libraries FASTQ : running '
894+
exp = {'subject': ('Split libraries FASTQ: running '
895895
'(063e553b-327c-4818-ab4a-adfe58e49860)'),
896896
'message': ('Processing Job: Split libraries FASTQ\n'
897897
f'{qiita_config.base_url}/study/description/1\n'
@@ -900,7 +900,7 @@ def test_notification_mail_generation(self):
900900
self.assertDictEqual(obs, exp)
901901

902902
obs = self.tester1._generate_notification_message('running', 'Yahoo!')
903-
exp = {'subject': ('Split libraries FASTQ : running '
903+
exp = {'subject': ('Split libraries FASTQ: running '
904904
'(063e553b-327c-4818-ab4a-adfe58e49860)'),
905905
'message': ('Processing Job: Split libraries FASTQ\n'
906906
f'{qiita_config.base_url}/study/description/1\n'
@@ -912,7 +912,7 @@ def test_notification_mail_generation(self):
912912
jid = '8a7a8461-e8a1-4b4e-a428-1bc2f4d3ebd0'
913913
pj = qdb.processing_job.ProcessingJob(jid)
914914
obs = pj._generate_notification_message('running', 'Yahoo!')
915-
exp = {'subject': 'Single Rarefaction : running '
915+
exp = {'subject': 'Single Rarefaction: running '
916916
'(8a7a8461-e8a1-4b4e-a428-1bc2f4d3ebd0)',
917917
'message': 'Analysis Job Single Rarefaction\n'
918918
f'{qiita_config.base_url}/analysis/description/1/\n'

0 commit comments

Comments
 (0)