Skip to content

Commit f6376f7

Browse files
author
Clement Champetier
committed
pyTest: fixed check of format long name
Depending on how ffmpeg/libav is built, the format long name could be empty. The tests should pass in this case.
1 parent 57a7105 commit f6376f7

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

test/pyTest/testOutputFile.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def testCreateOutputFileWithExtension():
1414

1515
assert_equals( ouputFile.getFilename(), outputFileName )
1616
assert_equals( ouputFile.getFormatName(), formatName )
17-
assert_equals( ouputFile.getFormatLongName(), formatLongName )
17+
assert_in( ouputFile.getFormatLongName(), (formatLongName, '') )
1818

1919

2020
@raises(IOError)
@@ -38,7 +38,7 @@ def testCreateOutputFileWithoutExtensionWithFormat():
3838

3939
assert_equals( ouputFile.getFilename(), outputFileName )
4040
assert_equals( ouputFile.getFormatName(), formatName )
41-
assert_equals( ouputFile.getFormatLongName(), formatLongName )
41+
assert_in( ouputFile.getFormatLongName(), (formatLongName, '') )
4242

4343

4444
def testCreateOutputFileWithUnknownExtensionWithFormat():
@@ -53,7 +53,7 @@ def testCreateOutputFileWithUnknownExtensionWithFormat():
5353

5454
assert_equals(ouputFile.getFilename(), outputFileName)
5555
assert_equals(ouputFile.getFormatName(), formatName)
56-
assert_equals(ouputFile.getFormatLongName(), formatLongName)
56+
assert_in( ouputFile.getFormatLongName(), (formatLongName, '') )
5757

5858

5959
def testCreateOutputFileWithoutExtensionWithMimeType():
@@ -83,7 +83,7 @@ def testCreateOutputFileWithoutExtensionWithInconsistentFormatAndMimeType():
8383

8484
assert_equals( ouputFile.getFilename(), outputFileName )
8585
assert_equals( ouputFile.getFormatName(), formatName )
86-
assert_equals( ouputFile.getFormatLongName(), formatLongName )
86+
assert_in( ouputFile.getFormatLongName(), (formatLongName, '') )
8787
assert_not_equals( ouputFile.getFormatMimeType(), mimeType )
8888

8989

0 commit comments

Comments
 (0)