fix qiita_db tests

Author: antgonza

qiita_db/metadata_template/prep_template.py

@@ -291,14 +291,12 @@ def delete(cls, id_):
                                 SELECT DISTINCT analysis_id
                                 FROM qiita.analysis_sample
                                 WHERE artifact_id IN %s)"""
-                    qdb.sql_connection.TRN.add(sql, [aid])
+                    qdb.sql_connection.TRN.add(sql, [tuple([aid])])
                     analyses = set(
                         qdb.sql_connection.TRN.execute_fetchflatten())
-                    if analyses:
-                        for _id in analyses:
-                            ANALYSIS.delete_analysis_artifacts(_id)
-                    else:
-                        ANALYSIS.delete(aid)
+                    for _id in analyses:
+                        ANALYSIS.delete_analysis_artifacts(_id)
+                    qdb.artifact.Artifact.delete(aid)
 
             # Delete the prep template filepaths
             sql = """DELETE FROM qiita.prep_template_filepath

qiita_db/test/test_analysis.py

@@ -688,7 +688,7 @@ def test_is_public_make_public(self):
     def test_slurm_reservation(self):
         analysis = qdb.analysis.Analysis(1)
         self.assertIsNone(analysis.slurm_reservation)
-        text = 'this is a test!'
+        text = 'thisisatest!'
         analysis.slurm_reservation = text
         self.assertEqual(analysis._slurm_reservation(), [text])
         self.assertIsNone(analysis.slurm_reservation)