fix some more errors

Author: antgonza

qiita_db/metadata_template/test/test_sample_template.py

@@ -1365,9 +1365,9 @@ def test_generate_files(self):
         fp_count = qdb.util.get_count("qiita.filepath")
         self.tester.generate_files()
         obs = qdb.util.get_count("qiita.filepath")
-        # We just make sure that the count has been increased by 3, since
+        # We just make sure that the count has been increased by 1, since
         # the contents of the files have been tested elsewhere.
-        self.assertEqual(obs, fp_count + 3)
+        self.assertEqual(obs, fp_count + 1)
 
     def test_to_file(self):
         """to file writes a tab delimited file with all the metadata"""

qiita_pet/handlers/api_proxy/tests/test_prep_template.py

@@ -76,8 +76,7 @@ def test_prep_template_ajax_get_req(self):
                'name': "Prep information 1",
                'files': ["uploaded_file.txt"],
                'download_prep_id': 24,
-               'other_filepaths': ['1_prep_1_qiime_19700101-000000.txt',
-                                   '1_prep_1_19700101-000000.txt',
+               'other_filepaths': ['1_prep_1_19700101-000000.txt',
                                    '1_prep_1_qiime_19700101-000000.txt',
                                    '1_prep_1_19700101-000000.txt'],
                'num_samples': 27,
@@ -200,7 +199,7 @@ def test_prep_template_filepaths_get_req(self):
         self.assertEqual(obs['message'], '')
         # [0] the fp_id is the first element, that should change
         fp_ids = [fp[0] for fp in obs['filepaths']]
-        self.assertCountEqual(fp_ids, [18, 19, 20, 21, 24])
+        self.assertCountEqual(fp_ids, [18, 19, 20, 21])
 
     def test_prep_template_filepaths_get_req_no_access(self):
         obs = prep_template_filepaths_get_req(1, '[email protected]')