From f94310fdb734c0c5c1522e9d5b26c96c2fa0a9e5 Mon Sep 17 00:00:00 2001 From: Maveno Date: Mon, 4 Nov 2024 10:23:33 +0100 Subject: [PATCH] Scenarios 1,2,4 passed --- .../{_basename_combinator_0.py => basename_combinator_0.py} | 0 bin/ffx/test/media_combinator_0.py | 2 +- bin/ffx/test/media_combinator_4.py | 2 +- bin/ffx/test/scenario_2.py | 4 ++-- 4 files changed, 4 insertions(+), 4 deletions(-) rename bin/ffx/test/{_basename_combinator_0.py => basename_combinator_0.py} (100%) diff --git a/bin/ffx/test/_basename_combinator_0.py b/bin/ffx/test/basename_combinator_0.py similarity index 100% rename from bin/ffx/test/_basename_combinator_0.py rename to bin/ffx/test/basename_combinator_0.py diff --git a/bin/ffx/test/media_combinator_0.py b/bin/ffx/test/media_combinator_0.py index 89b62a2..41c063b 100644 --- a/bin/ffx/test/media_combinator_0.py +++ b/bin/ffx/test/media_combinator_0.py @@ -101,4 +101,4 @@ class MediaCombinator0(MediaCombinator): yieldObj['preset'] = yObj_p - return yieldObj + yield yieldObj diff --git a/bin/ffx/test/media_combinator_4.py b/bin/ffx/test/media_combinator_4.py index 2910ce0..2224f63 100644 --- a/bin/ffx/test/media_combinator_4.py +++ b/bin/ffx/test/media_combinator_4.py @@ -152,4 +152,4 @@ class MediaCombinator4(MediaCombinator): | j.shouldFail()) yieldObj['preset'] = yObj_p - yield yieldObj + yield yieldObj diff --git a/bin/ffx/test/scenario_2.py b/bin/ffx/test/scenario_2.py index 8c4307a..f715f63 100644 --- a/bin/ffx/test/scenario_2.py +++ b/bin/ffx/test/scenario_2.py @@ -64,10 +64,10 @@ class Scenario2(Scenario): jellyfinSelectorIndex = -1 - if self._context['test_variant'] and variantIdentifier != self._context['test_variant']: + #if self._context['test_variant'] and variantIdentifier != self._context['test_variant']: + if self._context['test_variant'] and not variantIdentifier.startswith(self._context['test_variant']): return - self._logger.debug(f"Running Job: {variantLabel}")