Add clean up for initial tests?

tests/test_acoustic_modeling.py

@@ -36,6 +36,7 @@ def test_basic_mono(
     a.train()
     a.export_model(mono_align_model_path)
     assert mono_align_model_path.exists()
+    a.clean_working_directory()
     del a
     time.sleep(3)
     a = PretrainedAligner(
@@ -47,6 +48,7 @@ def test_basic_mono(
     a.align()
     a.export_files(mono_output_directory)
     assert mono_output_directory.exists()
+    a.clean_working_directory()
 
 
 def test_pronunciation_training(
@@ -75,7 +77,7 @@ def test_pronunciation_training(
         assert rule_query.probability > 0
         assert rule_query.probability < 1
 
-    a.cleanup()
+    a.clean_working_directory()
     assert not export_path.exists()
     assert not (generated_dir.joinpath("pron_train_test_export", mixed_dict_path.name).exists())
 
@@ -90,6 +92,7 @@ def test_pronunciation_training(
     assert generated_dir.joinpath(
         "pron_train_test_export", mixed_dict_path.with_suffix(".dict").name
     ).exists()
+    a.clean_working_directory()
 
 
 def test_pitch_feature_training(
@@ -105,6 +108,7 @@ def test_pitch_feature_training(
     assert a.use_pitch
     a.train()
     assert a.get_feat_dim() == 45
+    a.clean_working_directory()
 
 
 def test_basic_lda(basic_dict_path, basic_corpus_dir, lda_train_config_path, db_setup):
@@ -118,6 +122,7 @@ def test_basic_lda(basic_dict_path, basic_corpus_dir, lda_train_config_path, db_
     a.train()
     assert len(a.training_configs[a.final_identifier].realignment_iterations) > 0
     assert len(a.training_configs[a.final_identifier].mllt_iterations) > 1
+    a.clean_working_directory()
 
 
 @pytest.mark.skip("Inconsistent failing")
@@ -139,3 +144,4 @@ def test_basic_sat(
 
     assert output_model_path.exists()
     assert a.output_directory.joinpath("sat", "trans.1.1.ark").exists()
+    a.clean_working_directory()

tests/test_alignment_pretrained.py

@@ -29,6 +29,7 @@ def test_align_sick(
     assert "AY_S" in a.phone_mapping
     a.export_files(export_directory)
     assert os.path.exists(os.path.join(export_directory, "michael", "acoustic_corpus.TextGrid"))
+    a.clean_working_directory()
 
 
 def test_align_one(
@@ -83,3 +84,4 @@ def test_align_one(
         assert utterance.alignment_log_likelihood is not None
         assert utterance.features is None
         assert len(utterance.phone_intervals) > 0
+    a.clean_working_directory()

tests/test_commandline_adapt.py

@@ -1,4 +1,5 @@
 import os
+import shutil
 
 import click.testing
 
@@ -37,6 +38,7 @@ def test_adapt_basic(
         print(result.exc_info)
         raise result.exception
     assert os.path.exists(adapted_model_path)
+    shutil.rmtree(temp_dir.joinpath("adapt_cli"))
 
 
 def test_adapt_multilingual(
@@ -58,7 +60,7 @@ def test_adapt_multilingual(
         adapted_model_path,
         output_path,
         "-t",
-        temp_dir,
+        temp_dir.joinpath("multilingual_adapt"),
         "--config_path",
         basic_align_config_path,
         "-q",
@@ -75,3 +77,4 @@ def test_adapt_multilingual(
         print(result.exc_info)
         raise result.exception
     assert os.path.exists(adapted_model_path)
+    shutil.rmtree(temp_dir.joinpath("multilingual_adapt"))

tests/test_commandline_align.py

@@ -1,23 +1,12 @@
 import os
+import shutil
 
 import click.testing
 from praatio import textgrid as tgio
 
 from montreal_forced_aligner.command_line.mfa import mfa_cli
 
 
-def assert_export_exist(old_directory, new_directory):
-    for root, dirs, files in os.walk(old_directory):
-        new_root = root.replace(old_directory, new_directory)
-        for d in dirs:
-            assert os.path.exists(os.path.join(new_root, d))
-        for f in files:
-            if not f.endswith(".wav"):
-                continue
-            new_f = f.replace(".wav", ".TextGrid")
-            assert os.path.exists(os.path.join(new_root, new_f))
-
-
 def test_align_no_speaker_adaptation(
     basic_corpus_dir,
     generated_dir,
@@ -44,6 +33,7 @@ def test_align_no_speaker_adaptation(
     command = [str(x) for x in command]
     click.testing.CliRunner().invoke(mfa_cli, command, catch_exceptions=False)
     assert os.path.exists(output_directory)
+    shutil.rmtree(os.path.join(temp_dir, "test_align_no_speaker_adaptation"))
 
 
 def test_align_single_speaker(
@@ -94,6 +84,7 @@ def test_align_single_speaker(
 
     for path in output_paths:
         assert os.path.exists(path)
+    shutil.rmtree(os.path.join(temp_dir, "test_align_single_speaker"))
 
 
 def test_align_duplicated(
@@ -140,6 +131,7 @@ def test_align_duplicated(
 
     for path in output_paths:
         assert os.path.exists(path)
+    shutil.rmtree(os.path.join(temp_dir, "test_align_duplicated"))
 
 
 def test_align_multilingual(
@@ -177,6 +169,7 @@ def test_align_multilingual(
         print(result.exc_info)
         raise result.exception
     assert not result.return_value
+    shutil.rmtree(os.path.join(temp_dir, "test_align_multilingual"))
 
 
 def test_align_multilingual_speaker_dict(
@@ -214,6 +207,7 @@ def test_align_multilingual_speaker_dict(
         print(result.exc_info)
         raise result.exception
     assert not result.return_value
+    shutil.rmtree(os.path.join(temp_dir, "test_align_multilingual_speaker_dict"))
 
 
 def test_align_multilingual_tg_speaker_dict(
@@ -250,6 +244,7 @@ def test_align_multilingual_tg_speaker_dict(
         print(result.exc_info)
         raise result.exception
     assert not result.return_value
+    shutil.rmtree(os.path.join(temp_dir, "test_align_multilingual_tg_speaker_dict"))
 
 
 def test_align_evaluation(
@@ -294,6 +289,7 @@ def test_align_evaluation(
         print(result.exc_info)
         raise result.exception
     assert not result.return_value
+    shutil.rmtree(os.path.join(temp_dir, "test_align_evaluation"))
 
 
 def test_align_split(
@@ -334,6 +330,7 @@ def test_align_split(
         print(result.exc_info)
         raise result.exception
     assert not result.return_value
+    shutil.rmtree(os.path.join(temp_dir, "test_align_split"))
 
 
 def test_align_stereo(
@@ -374,6 +371,7 @@ def test_align_stereo(
         os.path.join(output_dir, "michaelandsickmichael.TextGrid"), includeEmptyIntervals=False
     )
     assert len(tg.tierNames) == 4
+    shutil.rmtree(os.path.join(temp_dir, "test_align_stereo"))
 
 
 def test_align_mp3s(
@@ -415,6 +413,8 @@ def test_align_mp3s(
     )
     assert len(tg.tierNames) == 2
 
+    shutil.rmtree(os.path.join(temp_dir, "test_align_mp3s"))
+
 
 def test_align_opus(
     opus_corpus_dir,
@@ -454,6 +454,7 @@ def test_align_opus(
         os.path.join(output_dir, "13697_11991_000000.TextGrid"), includeEmptyIntervals=False
     )
     assert len(tg.tierNames) == 2
+    shutil.rmtree(os.path.join(temp_dir, "test_align_opus"))
 
 
 def test_swedish_cv(
@@ -503,6 +504,8 @@ def test_swedish_cv(
         tg = tgio.openTextgrid(tg_path, includeEmptyIntervals=False)
         assert len(tg.tierNames) == 2
 
+    shutil.rmtree(os.path.join(temp_dir, "test_swedish_cv"))
+
 
 def test_swedish_mfa(
     swedish_dir,
@@ -551,6 +554,8 @@ def test_swedish_mfa(
         tg = tgio.openTextgrid(tg_path, includeEmptyIntervals=False)
         assert len(tg.tierNames) == 2
 
+    shutil.rmtree(os.path.join(temp_dir, "test_swedish_mfa"))
+
 
 def test_acoustic_g2p_model(
     basic_corpus_dir,
@@ -600,3 +605,4 @@ def test_acoustic_g2p_model(
 
     for path in output_paths:
         assert os.path.exists(path)
+    shutil.rmtree(os.path.join(temp_dir, "test_acoustic_g2p_model"))