code review suggestions

EveryVoiceTTS · Apr 17, 2024 · df4f5f6 · df4f5f6
1 parent ec501d9
commit df4f5f6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 17 deletions.
diff --git a/everyvoice/tests/preprocessed_audio_fixture.py b/everyvoice/tests/preprocessed_audio_fixture.py
@@ -65,7 +65,7 @@ def setUpClass(cls):
             PreprocessedAudioFixture.preprocessor.preprocess(
                 output_path=str(PreprocessedAudioFixture.lj_filelist),
                 cpus=1,
-                overwrite=False,
+                overwrite=True,
                 to_process=("audio", "energy", "pitch", "text", "spec"),
             )
             PreprocessedAudioFixture.lj_preprocessed.mkdir(parents=True, exist_ok=True)

diff --git a/everyvoice/tests/test_dataloader.py b/everyvoice/tests/test_dataloader.py
@@ -11,6 +11,7 @@
 from everyvoice.model.vocoder.config import VocoderConfig
 from everyvoice.model.vocoder.HiFiGAN_iSTFT_lightning.hfgl.config import (
     HiFiGANTrainingConfig,
+    PreprocessingConfig,
 )
 from everyvoice.model.vocoder.HiFiGAN_iSTFT_lightning.hfgl.dataset import (
     HiFiGANDataModule,
@@ -24,29 +25,26 @@
 class DataLoaderTest(PreprocessedAudioFixture, BasicTestCase):
     """Basic test for dataloaders"""
 
-    # FIXME: Shouldn't this be done only one for this class and not for every test?
     def setUp(self) -> None:
         super().setUp()
+
         self.config = EveryVoiceConfig(
-            contact=self.contact,
-            aligner=AlignerConfig(contact=self.contact),
-            feature_prediction=FeaturePredictionConfig(contact=self.contact),
+            contact=BasicTestCase.contact,
+            aligner=AlignerConfig(contact=BasicTestCase.contact),
+            feature_prediction=FeaturePredictionConfig(contact=BasicTestCase.contact),
             vocoder=VocoderConfig(
-                contact=self.contact,
+                contact=BasicTestCase.contact,
                 training=HiFiGANTrainingConfig(
                     training_filelist=PreprocessedAudioFixture.lj_preprocessed
-                    / "training_preprocessed_filelist.psv",
+                    / "preprocessed_filelist.psv",
                     validation_filelist=PreprocessedAudioFixture.lj_preprocessed
                     / "validation_preprocessed_filelist.psv",
                 ),
+                preprocessing=PreprocessingConfig(
+                    save_dir=PreprocessedAudioFixture.lj_preprocessed,
+                ),
             ),
         )
-        self.config.vocoder.preprocessing.save_dir = (
-            PreprocessedAudioFixture.lj_preprocessed
-        )
-        self.config.vocoder.training.training_filelist = (
-            PreprocessedAudioFixture.lj_preprocessed / "preprocessed_filelist.psv"
-        )
 
     def test_base_data_loader(self):
         bdm = BaseDataModule(self.config.aligner)

diff --git a/everyvoice/tests/test_preprocessing.py b/everyvoice/tests/test_preprocessing.py
@@ -30,10 +30,7 @@
 class PreprocessingTest(PreprocessedAudioFixture, BasicTestCase):
     """Unit tests for preprocessing steps"""
 
-    def setUp(self) -> None:
-        super().setUp()
-        # FIXME: if this metadata.psv doesn't change, shouldn't this be done in setUpClass() instead?
-        self.filelist = generic_psv_filelist_reader(self.data_dir / "metadata.psv")
+    filelist = generic_psv_filelist_reader(BasicTestCase.data_dir / "metadata.psv")
 
     def test_run_doctest(self):
         """Run doctests in everyvoice.text.text_processing"""