Skip to content

Commit 0889b45

Browse files
clanmillsclanmills
committed
Fixing test suite. I've explained the changes in a note in the PR.
1 parent cf9be2c commit 0889b45

File tree

6 files changed

+101
-95
lines changed

6 files changed

+101
-95
lines changed

‎test/data/crw-test.out‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ Exif.CanonCs.Quality Short 1 RAW
4141
Exif.CanonCs.FlashMode Short 1 Off
4242
Exif.CanonCs.DriveMode Short 1 Single / timer
4343
Exif.CanonCs.FocusMode Short 1 AI servo AF
44+
Exif.CanonCs.RecordMode Short 1 CRW+THM
4445
Exif.CanonCs.ImageSize Short 1 Large
4546
Exif.CanonCs.EasyMode Short 1 Manual
4647
Exif.CanonCs.DigitalZoom Short 1 None
@@ -155,6 +156,7 @@ Exif.CanonCs.Quality Short 1 RAW
155156
Exif.CanonCs.FlashMode Short 1 Off
156157
Exif.CanonCs.DriveMode Short 1 Single / timer
157158
Exif.CanonCs.FocusMode Short 1 AI servo AF
159+
Exif.CanonCs.RecordMode Short 1 CRW+THM
158160
Exif.CanonCs.ImageSize Short 1 Large
159161
Exif.CanonCs.EasyMode Short 1 Manual
160162
Exif.CanonCs.DigitalZoom Short 1 None
@@ -223,6 +225,7 @@ Exif.CanonCs.Quality Short 1 RAW
223225
Exif.CanonCs.FlashMode Short 1 Off
224226
Exif.CanonCs.DriveMode Short 1 Single / timer
225227
Exif.CanonCs.FocusMode Short 1 AI servo AF
228+
Exif.CanonCs.RecordMode Short 1 CRW+THM
226229
Exif.CanonCs.ImageSize Short 1 Large
227230
Exif.CanonCs.EasyMode Short 1 Manual
228231
Exif.CanonCs.DigitalZoom Short 1 None

‎test/data/exifdata-test.out‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ Exif.CanonCs.DriveMode 0x0005 Makernote Short 1
201201
Exif.CanonCs.0x0006 0x0006 Makernote Short 1 0
202202
Exif.CanonCs.FocusMode 0x0007 Makernote Short 1 4
203203
Exif.CanonCs.0x0008 0x0008 Makernote Short 1 0
204-
Exif.CanonCs.0x0009 0x0009 Makernote Short 1 1
204+
Exif.CanonCs.RecordMode 0x0009 Makernote Short 1 1
205205
Exif.CanonCs.ImageSize 0x000a Makernote Short 1 0
206206
Exif.CanonCs.EasyMode 0x000b Makernote Short 1 1
207207
Exif.CanonCs.DigitalZoom 0x000c Makernote Short 1 0
@@ -330,7 +330,7 @@ Exif.CanonCs.DriveMode 0x0005 Makernote Short 1
330330
Exif.CanonCs.0x0006 0x0006 Makernote Short 1 0
331331
Exif.CanonCs.FocusMode 0x0007 Makernote Short 1 4
332332
Exif.CanonCs.0x0008 0x0008 Makernote Short 1 0
333-
Exif.CanonCs.0x0009 0x0009 Makernote Short 1 1
333+
Exif.CanonCs.RecordMode 0x0009 Makernote Short 1 1
334334
Exif.CanonCs.ImageSize 0x000a Makernote Short 1 0
335335
Exif.CanonCs.EasyMode 0x000b Makernote Short 1 1
336336
Exif.CanonCs.DigitalZoom 0x000c Makernote Short 1 0
@@ -460,7 +460,7 @@ Exif.CanonCs.DriveMode 0x0005 Makernote Short 1
460460
Exif.CanonCs.0x0006 0x0006 Makernote Short 1 0
461461
Exif.CanonCs.FocusMode 0x0007 Makernote Short 1 4
462462
Exif.CanonCs.0x0008 0x0008 Makernote Short 1 0
463-
Exif.CanonCs.0x0009 0x0009 Makernote Short 1 1
463+
Exif.CanonCs.RecordMode 0x0009 Makernote Short 1 1
464464
Exif.CanonCs.ImageSize 0x000a Makernote Short 1 0
465465
Exif.CanonCs.EasyMode 0x000b Makernote Short 1 1
466466
Exif.CanonCs.DigitalZoom 0x000c Makernote Short 1 0
@@ -590,7 +590,7 @@ Exif.CanonCs.DriveMode 0x0005 Makernote Short 1
590590
Exif.CanonCs.0x0006 0x0006 Makernote Short 1 0
591591
Exif.CanonCs.FocusMode 0x0007 Makernote Short 1 4
592592
Exif.CanonCs.0x0008 0x0008 Makernote Short 1 0
593-
Exif.CanonCs.0x0009 0x0009 Makernote Short 1 1
593+
Exif.CanonCs.RecordMode 0x0009 Makernote Short 1 1
594594
Exif.CanonCs.ImageSize 0x000a Makernote Short 1 0
595595
Exif.CanonCs.EasyMode 0x000b Makernote Short 1 1
596596
Exif.CanonCs.DigitalZoom 0x000c Makernote Short 1 0

‎test/data/exiv2-test.out‎

Lines changed: 90 additions & 90 deletions
Large diffs are not rendered by default.

‎tests/bugfixes/github/test_issue_247.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ class TestFirstPoC(metaclass=system_tests.CaseMeta):
4343
Exif.CanonCs.FlashMode Short 1 Auto
4444
Exif.CanonCs.DriveMode Short 1 Single / timer
4545
Exif.CanonCs.FocusMode Short 1 Single
46+
Exif.CanonCs.RecordMode Short 1 JPEG
4647
Exif.CanonCs.ImageSize Short 1 Large
4748
Exif.CanonCs.EasyMode Short 1 Manual
4849
Exif.CanonCs.DigitalZoom Short 1 None

‎tests/bugfixes/github/test_issue_981.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ class CanonAfInfoTest(metaclass=CaseMeta):
4848
Exif.Canon.AFPointsInFocus Short 4 25
4949
Exif.Canon.AFPointsSelected Short 4 25
5050
Exif.Canon.AFPointsUnusable Short 4 (none)
51+
Exif.Canon.AFMicroAdj Long 11 44 2 0 10 4294967295 0 10 0 10 0 10
52+
Exif.Canon.AFConfig Long 20 80 4 0 0 1 0 0 0 0 1 0 1 32639 1 0 1 0 0 0 2
5153
""","""0x2602 Canon AFNumPoints SShort 1 63
5254
0x2603 Canon AFValidPoints SShort 1 61
5355
0x260c Canon AFPointsInFocus Short 4 0 560 57344 0

‎tests/bugfixes/redmine/test_issue_445.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class SetCommentOnImageWithEmptyComment(metaclass=system_tests.CaseMeta):
5858
Exif.CanonCs.0x0006 Short 1 0
5959
Exif.CanonCs.FocusMode Short 1 Single
6060
Exif.CanonCs.0x0008 Short 1 0
61-
Exif.CanonCs.0x0009 Short 1 1
61+
Exif.CanonCs.RecordMode Short 1 JPEG
6262
Exif.CanonCs.ImageSize Short 1 Large
6363
Exif.CanonCs.EasyMode Short 1 Manual
6464
Exif.CanonCs.DigitalZoom Short 1 None

0 commit comments

Comments
 (0)