Making sure tests clean the environment

Author: josenavas

qiita_db/test/test_data.py

@@ -261,6 +261,11 @@ def test_delete(self):
             RawData.delete(rd.id, self.pt1.id)
 
         # Clear the files so we can actually remove the RawData
+        study_id = rd.studies[0]
+        path_for_removal = join(get_mountpoint("uploads")[0][1], str(study_id))
+        self._clean_up_files = [join(path_for_removal,
+                                     basename(f).split('_', 1)[1])
+                                for _, f, _ in rd.get_filepaths()]
         rd.clear_filepaths()
 
         RawData.delete(rd.id, self.pt1.id)

qiita_db/test/test_util.py

@@ -575,7 +575,10 @@ def test_move_upload_files_to_trash(self):
 
         # create file to move to trash
         fid, folder = get_mountpoint("uploads")[0]
-        open(join(folder, '1', test_filename), 'w').write('test')
+        test_fp = join(folder, '1', test_filename)
+        open(test_fp, 'w').write('test')
+
+        self.files_to_remove.append(test_fp)
 
         exp = [(fid, 'this_is_a_test_file.txt'), (fid, 'uploaded_file.txt')]
         obs = get_files_from_uploads_folders("1")