Fix tests for linux

Author: cdgriffith

pyproject.toml

@@ -27,18 +27,6 @@ dependencies = [
     "ffmpeg-normalize>=1.31.3,<2.0",
 ]
 
-[project.optional-dependencies]
-develop = [
-    "wheel>=0.38.4",
-    "typing_extensions>=4.4",
-    "pyinstaller==6.13.0",
-    "pytest>=7.3",
-    "types-requests>=2.28",
-    "types-setuptools>=65.7",
-    "pre-commit>=3.0",
-    "ruff>=0.12"
-]
-
 [project.scripts]
 fastflix = "fastflix.__main__:start_fastflix"
 

tests/encoders/test_avc_x264_command_builder.py

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 from unittest import mock
 
+import reusables
+
 from fastflix.encoders.avc_x264.command_builder import build
 from fastflix.models.encode import x264Settings
 from fastflix.models.video import VideoSettings
@@ -81,13 +83,19 @@ def test_avc_x264_two_pass_bitrate():
                 result = build(fastflix)
 
                 # The expected command should be a list of two Command objects for two-pass encoding
-                expected_commands = [
-                    'ffmpeg -y -i input.mkv  --color_details  -pass 1 -passlogfile "work_path\\pass_log_file_abcdef1234" -b:v 5000k -preset:v medium  -an -sn -dn -r 24 -f mp4',
-                    'ffmpeg -y -i input.mkv  --color_details  -pass 2 -passlogfile "work_path\\pass_log_file_abcdef1234" -b:v 5000k -preset:v medium   output.mkv',
-                ]
+                if reusables.win_based:
+                    expected_commands = [
+                        'ffmpeg -y -i input.mkv  --color_details  -pass 1 -passlogfile "work_path\\pass_log_file_abcdef1234" -b:v 5000k -preset:v medium  -an -sn -dn -r 24 -f mp4 NUL',
+                        'ffmpeg -y -i input.mkv  --color_details  -pass 2 -passlogfile "work_path\\pass_log_file_abcdef1234" -b:v 5000k -preset:v medium   output.mkv',
+                    ]
+                else:
+                    expected_commands = [
+                        'ffmpeg -y -i input.mkv  --color_details  -pass 1 -passlogfile "work_path/pass_log_file_abcdef1234" -b:v 5000k -preset:v medium  -an -sn -dn -r 24 -f mp4 /dev/null',
+                        'ffmpeg -y -i input.mkv  --color_details  -pass 2 -passlogfile "work_path/pass_log_file_abcdef1234" -b:v 5000k -preset:v medium   output.mkv',
+                    ]
                 assert isinstance(result, list), f"Expected a list of Command objects, got {type(result)}"
                 assert len(result) == 2, f"Expected 2 Command objects, got {len(result)}"
-                assert result[0].command.startswith(expected_commands[0]), (
+                assert result[0].command == expected_commands[0], (
                     f"Expected: {expected_commands[0]}\nGot: {result[0].command}"
                 )
                 assert result[1].command == expected_commands[1], (

tests/encoders/test_ffmpeg_hevc_nvenc_command_builder.py

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 from unittest import mock
 
+import reusables
+
 from fastflix.encoders.ffmpeg_hevc_nvenc.command_builder import build
 from fastflix.models.encode import FFmpegNVENCSettings
 from fastflix.models.video import VideoSettings
@@ -94,13 +96,19 @@ def test_ffmpeg_hevc_nvenc_bitrate():
                 result = build(fastflix)
 
                 # The expected command should be a list of two Command objects for two-pass encoding
-                expected_commands = [
-                    'ffmpeg -y -i input.mkv -tune:v hq --color_details -spatial_aq:v 0 -tier:v main -rc-lookahead:v 0 -gpu -1 -b_ref_mode disabled -profile:v main  -pass 1 -passlogfile "work_path\\pass_log_file_abcdef1234" -b:v 6000k -preset:v slow -2pass 1  -an -sn -dn -r 24 -f mp4',
-                    'ffmpeg -y -i input.mkv -tune:v hq --color_details -spatial_aq:v 0 -tier:v main -rc-lookahead:v 0 -gpu -1 -b_ref_mode disabled -profile:v main  -pass 2 -passlogfile "work_path\\pass_log_file_abcdef1234" -2pass 1 -b:v 6000k -preset:v slow   output.mkv',
-                ]
+                if reusables.win_based:
+                    expected_commands = [
+                        'ffmpeg -y -i input.mkv -tune:v hq --color_details -spatial_aq:v 0 -tier:v main -rc-lookahead:v 0 -gpu -1 -b_ref_mode disabled -profile:v main  -pass 1 -passlogfile "work_path\\pass_log_file_abcdef1234" -b:v 6000k -preset:v slow -2pass 1  -an -sn -dn -r 24 -f mp4 NUL',
+                        'ffmpeg -y -i input.mkv -tune:v hq --color_details -spatial_aq:v 0 -tier:v main -rc-lookahead:v 0 -gpu -1 -b_ref_mode disabled -profile:v main  -pass 2 -passlogfile "work_path\\pass_log_file_abcdef1234" -2pass 1 -b:v 6000k -preset:v slow   output.mkv',
+                    ]
+                else:
+                    expected_commands = [
+                        'ffmpeg -y -i input.mkv -tune:v hq --color_details -spatial_aq:v 0 -tier:v main -rc-lookahead:v 0 -gpu -1 -b_ref_mode disabled -profile:v main  -pass 1 -passlogfile "work_path/pass_log_file_abcdef1234" -b:v 6000k -preset:v slow -2pass 1  -an -sn -dn -r 24 -f mp4 /dev/null',
+                        'ffmpeg -y -i input.mkv -tune:v hq --color_details -spatial_aq:v 0 -tier:v main -rc-lookahead:v 0 -gpu -1 -b_ref_mode disabled -profile:v main  -pass 2 -passlogfile "work_path/pass_log_file_abcdef1234" -2pass 1 -b:v 6000k -preset:v slow   output.mkv',
+                    ]
                 assert isinstance(result, list), f"Expected a list of Command objects, got {type(result)}"
                 assert len(result) == 2, f"Expected 2 Command objects, got {len(result)}"
-                assert result[0].command.startswith(expected_commands[0]), (
+                assert result[0].command == expected_commands[0], (
                     f"Expected: {expected_commands[0]}\nGot: {result[0].command}"
                 )
                 assert result[1].command == expected_commands[1], (

tests/encoders/test_hevc_x265_command_builder.py

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 from unittest import mock
 
+import reusables
+
 from fastflix.encoders.hevc_x265.command_builder import build
 from fastflix.models.encode import x265Settings
 from fastflix.models.video import VideoSettings
@@ -83,12 +85,12 @@ def test_hevc_x265_two_pass_bitrate():
 
             # The expected command should be a list of two Command objects for two-pass encoding
             expected_commands = [
-                'ffmpeg -y -i input.mkv  -x265-params "aq-mode=2:repeat-headers=0:strong-intra-smoothing=1:bframes=4:b-adapt=2:frame-threads=0:colorprim=bt2020:transfer=smpte2084:colormatrix=bt2020nc:hdr10_opt=0:hdr10=0:chromaloc=0:pass=1:no-slow-firstpass=1:stats=pass_log_file_abcdef1234.log"   -b:v 5000k -preset:v medium   -an -sn -dn None -f mp4',
+                f'ffmpeg -y -i input.mkv  -x265-params "aq-mode=2:repeat-headers=0:strong-intra-smoothing=1:bframes=4:b-adapt=2:frame-threads=0:colorprim=bt2020:transfer=smpte2084:colormatrix=bt2020nc:hdr10_opt=0:hdr10=0:chromaloc=0:pass=1:no-slow-firstpass=1:stats=pass_log_file_abcdef1234.log"   -b:v 5000k -preset:v medium   -an -sn -dn None -f mp4 {"NUL" if reusables.win_based else "/dev/null"}',
                 'ffmpeg -y -i input.mkv  -x265-params "aq-mode=2:repeat-headers=0:strong-intra-smoothing=1:bframes=4:b-adapt=2:frame-threads=0:colorprim=bt2020:transfer=smpte2084:colormatrix=bt2020nc:hdr10_opt=0:hdr10=0:chromaloc=0:pass=2:stats=pass_log_file_abcdef1234.log"   -b:v 5000k -preset:v medium   output.mkv',
             ]
             assert isinstance(result, list), f"Expected a list of Command objects, got {type(result)}"
             assert len(result) == 2, f"Expected 2 Command objects, got {len(result)}"
-            assert result[0].command.startswith(expected_commands[0]), (
+            assert result[0].command == expected_commands[0], (
                 f"Expected: {expected_commands[0]}\nGot: {result[0].command}"
             )
             assert result[1].command == expected_commands[1], (

tests/encoders/test_svt_av1_command_builder.py

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 from unittest import mock
 
+import reusables
+
 from fastflix.encoders.svt_av1.command_builder import build
 from fastflix.models.encode import SVTAV1Settings
 from fastflix.models.video import VideoSettings
@@ -85,12 +87,12 @@ def test_svt_av1_two_pass_qp():
 
                 # The expected command should be a list of two Command objects for two-pass encoding
                 expected_commands = [
-                    'ffmpeg -y -i input.mkv -strict experimental -preset 7 --color_details  -svtav1-params "tile-columns=0:tile-rows=0:scd=0:color-primaries=9:transfer-characteristics=16:matrix-coefficients=9" -passlogfile "pass_log_file_abcdef1234"  -crf 24 -pass 1  -an -r 24 -f matroska',
+                    f'ffmpeg -y -i input.mkv -strict experimental -preset 7 --color_details  -svtav1-params "tile-columns=0:tile-rows=0:scd=0:color-primaries=9:transfer-characteristics=16:matrix-coefficients=9" -passlogfile "pass_log_file_abcdef1234"  -crf 24 -pass 1  -an -r 24 -f matroska {"NUL" if reusables.win_based else "/dev/null"}',
                     'ffmpeg -y -i input.mkv -strict experimental -preset 7 --color_details  -svtav1-params "tile-columns=0:tile-rows=0:scd=0:color-primaries=9:transfer-characteristics=16:matrix-coefficients=9" -passlogfile "pass_log_file_abcdef1234"  -crf 24 -pass 2   output.mkv',
                 ]
                 assert isinstance(result, list), f"Expected a list of Command objects, got {type(result)}"
                 assert len(result) == 2, f"Expected 2 Command objects, got {len(result)}"
-                assert result[0].command.startswith(expected_commands[0]), (
+                assert result[0].command == expected_commands[0], (
                     f"Expected: {expected_commands[0]}\nGot: {result[0].command}"
                 )
                 assert result[1].command == expected_commands[1], (