fixing errors

Author: antgonza

qiita_db/artifact.py

@@ -476,7 +476,7 @@ def _associate_with_analysis(instance, analysis_id):
                 instance = _common_creation_steps(
                     artifact_type, None, data_type, None)
                 # Associate the artifact with the analysis
-                if analysis is not None:
+                if bool(analysis):
                     analysis.add_artifact(instance)
 
             # Associate the artifact with its filepaths

qiita_db/handlers/tests/test_processing_job.py

@@ -51,7 +51,8 @@ def test_get(self):
                   "phred_quality_threshold": 3, "barcode_type": "golay_12",
                   "max_barcode_errors": 1.5, "input_data": 1,
                   'phred_offset': 'auto'}
-        exp = {'command': cmd, 'parameters': params, 'status': 'success'}
+        exp = {'command': cmd, 'parameters': params, 'status': 'success',
+               'msg': ''}
         self.assertEqual(loads(obs.body), exp)
 
     def test_get_no_header(self):

qiita_pet/handlers/api_proxy/tests/test_prep_template.py

@@ -54,7 +54,8 @@ def test_new_prep_template_get_req(self):
             'prep_files': ['uploaded_file.txt'],
             'data_types': ['16S', '18S', 'Genomics', 'ITS', 'Metabolomic',
                            'Metagenomic', 'Metatranscriptomics', 'Multiomic',
-                           'Proteomic', 'Transcriptomics', 'Viromics'],
+                           'Proteomic', 'Transcriptomics', 'Viromics',
+                           'job_output_folder'],
             'ontology': {
                 'ENA': ['Cancer Genomics', 'Epigenetics', 'Exome Sequencing',
                         'Forensic or Paleo-genomics', 'Gene Regulation Study',

qiita_pet/handlers/study_handlers/tests/test_sample_template.py

@@ -308,7 +308,7 @@ def test_sample_template_overview_handler_get_request(self):
                'data_types': ['16S', '18S', 'Genomics', 'ITS', 'Metabolomic',
                               'Metagenomic', 'Metatranscriptomics',
                               'Multiomic', 'Proteomic', 'Transcriptomics',
-                              'Viromics'],
+                              'Viromics', 'job_output_folder'],
                'user_can_edit': True,
                'job': None,
                'download_id': None,

qiita_pet/test/test_download.py

@@ -425,7 +425,8 @@ def test_download(self):
         self.assertEqual(response.reason, 'Not a valid data_type. Valid types '
                          'are: 16S, 18S, ITS, Proteomic, Metabolomic, '
                          'Metagenomic, Multiomic, Metatranscriptomics, '
-                         'Viromics, Genomics, Transcriptomics')
+                         'Viromics, Genomics, Transcriptomics, '
+                         'job_output_folder')
 
         response = self.get(
             '/public_download/?data=raw&study_id=1&data_type=Genomics')