Make input/output cmd-line args deterministically sorted

kkroening · kkroening · commit 525b1bf452bb · 2017-06-14T02:25:58.000-06:00
diff --git a/ffmpeg/_run.py b/ffmpeg/_run.py
@@ -23,6 +23,16 @@ def _get_stream_name(name):
     return '[{}]'.format(name)
 
 
+def _convert_kwargs_to_cmd_line_args(kwargs):
+    args = []
+    for k in sorted(kwargs.keys()):
+        v = kwargs[k]
+        args.append('-{}'.format(k))
+        if v:
+            args.append('{}'.format(v))
+    return args
+
+
 def _get_input_args(input_node):
     if input_node._name == input.__name__:
         kwargs = copy.copy(input_node._kwargs)
@@ -34,10 +44,7 @@ def _get_input_args(input_node):
             args += ['-f', fmt]
         if video_size:
             args += ['-video_size', '{}x{}'.format(video_size[0], video_size[1])]
-        for k, v in kwargs.items():
-            args.append('-{}'.format(k))
-            if v:
-                args.append('{}'.format(v))
+        args += _convert_kwargs_to_cmd_line_args(kwargs)
         args += ['-i', filename]
     else:
         assert False, 'Unsupported input node: {}'.format(input_node)
@@ -95,13 +102,9 @@ def _get_output_args(node, stream_name_map):
             kwargs = copy.copy(node._kwargs)
             filename = kwargs.pop('filename')
             fmt = kwargs.pop('format', None)
-
             if fmt:
                 args += ['-f', fmt]
-            for k, v in kwargs.items():
-                args.append('-{}'.format(k))
-                if v:
-                    args.append('{}'.format(v))
+            args += _convert_kwargs_to_cmd_line_args(kwargs)
             args += [filename]
         else:
             assert False, 'Unsupported output node: {}'.format(node)
diff --git a/ffmpeg/tests/test_ffmpeg.py b/ffmpeg/tests/test_ffmpeg.py
@@ -187,8 +187,8 @@ def test_pipe():
     assert args == [
         '-f', 'rawvideo',
         '-video_size', '{}x{}'.format(width, height),
-        '-pixel_format', 'rgb24',
         '-framerate', '10',
+        '-pixel_format', 'rgb24',
         '-i', 'pipe:0',
         '-filter_complex',
             '[0]trim=start_frame=2[v0]',
diff --git a/tox.ini b/tox.ini
@@ -7,7 +7,7 @@
 envlist = py27, py33, py34, py35, py36, pypy
 
 [testenv]
-commands = py.test
+commands = py.test -vv
 deps =
     future
     pytest
