From 8a0e420080eb4e34b5d6c268fa1baeda918c4304 Mon Sep 17 00:00:00 2001
From: Faylixe <felix.voituret@gmail.com>
Date: Tue, 8 Dec 2020 14:22:31 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=20fix=20evaluation=20test?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 spleeter/__main__.py | 15 +++++++++------
 spleeter/options.py  |  2 +-
 tests/test_eval.py   |  5 ++++-
 tests/test_train.py  |  1 -
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/spleeter/__main__.py b/spleeter/__main__.py
index c20de9a..c977cfe 100644
--- a/spleeter/__main__.py
+++ b/spleeter/__main__.py
@@ -189,15 +189,18 @@ def evaluate(
     mixtures = [join(song, EVALUATION_MIXTURE) for song in songs]
     audio_output_directory = join(output_path, EVALUATION_AUDIO_DIRECTORY)
     separate(
-        adapter=adapter,
-        params_filename=params_filename,
         files=mixtures,
-        output_path=output_path,
-        filename_format='{foldername}/{instrument}.{codec}',
+        adapter=adapter,
+        bitrate='128k',
         codec=Codec.WAV,
+        duration=600.,
+        offset=0,
+        output_path=output_path,
+        stft_backend=stft_backend,
+        filename_format='{foldername}/{instrument}.{codec}',
+        params_filename=params_filename,
         mwf=mwf,
-        verbose=verbose,
-        stft_backend=stft_backend)
+        verbose=verbose,)
     # Compute metrics with musdb.
     metrics_output_directory = join(output_path, EVALUATION_METRICS_DIRECTORY)
     logger.info('Starting musdb evaluation (this could be long) ...')
diff --git a/spleeter/options.py b/spleeter/options.py
index d5c89db..99cf1ad 100644
--- a/spleeter/options.py
+++ b/spleeter/options.py
@@ -26,7 +26,7 @@ AudioInputArgument: ArgumentInfo = Argument(
     resolve_path=True)
 
 AudioAdapterOption: OptionInfo = Option(
-    'spleeter.audio.ffmpeg.FFMPEGProcessAudioAdapter',
+    'spleeter.audio.adapter.ffmpeg.FFMPEGProcessAudioAdapter',
     '--adapter',
     '-a',
     help='Name of the audio adapter to use for audio I/O')
diff --git a/tests/test_eval.py b/tests/test_eval.py
index 06bfb88..4103cad 100644
--- a/tests/test_eval.py
+++ b/tests/test_eval.py
@@ -72,10 +72,13 @@ def test_evaluate(backend):
     with TemporaryDirectory() as directory:
         generate_fake_eval_dataset(directory)
         metrics = evaluate(
+            adapter='spleeter.audio.adapter.ffmpeg.FFMPEGProcessAudioAdapter',
+            output_path='eval',
             stft_backend=backend,
             params_filename='spleeter:4stems',
             mus_dir=directory,
-        )
+            mwf=False,
+            verbose=False)
         for instrument, metric in metrics.items():
             for m, value in metric.items():
                 assert np.allclose(
diff --git a/tests/test_train.py b/tests/test_train.py
index a03cf6e..7c4bc48 100644
--- a/tests/test_train.py
+++ b/tests/test_train.py
@@ -101,7 +101,6 @@ def test_train():
             '-p', 'useless_config.json',
             '-d', path
         ])
-        raise IOError(result.stdout)
         assert result.exit_code == 0
         # assert that model checkpoint was created.
         assert os.path.exists(join(path, 'model', 'model.ckpt-10.index'))