Fixing tests. test_issue_981.py is now running all 6 commands. The output Key has correctly changed. The type and value are wrong.

```bash
730 rmills@rmillsmm-local:~/gnu/github/exiv2/update_canon_tags_2/build $ env DYLD_LIBRARY_PATH=$PWD/lib bin/exiv2 -g InfoSize ../test/data/*981*a.exv
Exif.CanonAf2Id.AFInfoSize                   SLong       1  131168
731 rmills@rmillsmm-local:~/gnu/github/exiv2/update_canon_tags_2/build $ exiv2 -g InfoSize ../test/data/*981*a.exv
Exif.Canon.AFInfoSize                        SShort      1  96
732 rmills@rmillsmm-local:~/gnu/github/exiv2/update_canon_tags_2/build $
```
This commit is contained in:
Robin Mills
2022-02-10 13:10:47 +00:00
committed by Luis Diaz
parent d19e2d42df
commit e1889e39bd
7 changed files with 70 additions and 55 deletions
+4
View File
@@ -75,14 +75,18 @@ Exif.CanonSi.ISOSpeed Short 1 100
Exif.CanonSi.MeasuredEV Short 1 13.63
Exif.CanonSi.TargetAperture Short 1 F5
Exif.CanonSi.TargetShutterSpeed Short 1 1/501 s
Exif.CanonSi.ExposureCompensation Short 1 0
Exif.CanonSi.WhiteBalance Short 1 Auto
Exif.CanonSi.SlowShutter Short 1 Off
Exif.CanonSi.Sequence Short 1 0
Exif.CanonSi.OpticalZoomCode Short 1 6
Exif.CanonSi.CameraTemperature Short 1 --
Exif.CanonSi.FlashGuideNumber Short 1 0
Exif.CanonSi.AFPointUsed Short 1 3 focus points; center used
Exif.CanonSi.FlashBias Short 1 0 EV
Exif.CanonSi.AutoExposureBracketing Short 1 Off
Exif.CanonSi.AEBBracketValue Short 1 0
Exif.CanonSi.ControlMode Short 1 1
Exif.CanonSi.SubjectDistance Short 1 7.82 m
Exif.CanonSi.ApertureValue Short 1 F5
Exif.CanonSi.ShutterSpeedValue Short 1 1/523 s
+5 -5
View File
@@ -32,7 +32,7 @@ Exif.Canon.AFYPositions SShort 9 0 321 -321 603 0 -60
Exif.Canon.AFPointsInFocus Short 1 4
Exif.Canon.AFPointsSelected Short 1 8
Exif.Canon.AFPointsUnusable Short 1 (none)
Exif.Canon.AFInfo Short 273 546 2 63 61 6720 4480 6720 4480 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 0 0 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 0 0 65200 64790 64435 64099 63764 336 0 65200 64099 63764 1772 1437 1101 746 336 0 1437 1101 746 336 0 65200 64790 64435 336 0 65200 64790 64435 64099 63764 1772 64790 64435 64099 63764 1772 1437 1101 746 63764 1772 1437 1101 746 336 0 65200 1101 746 336 0 65200 64790 64435 64099 336 0 65200 1772 1437 0 0 547 625 625 625 625 821 821 821 308 308 625 625 625 625 547 547 308 308 308 274 274 274 308 308 0 0 0 0 0 0 0 308 65228 65228 65228 65228 0 0 0 0 64911 65228 65228 65228 65228 65262 65262 65262 64911 64911 64989 64989 64989 64911 64911 64911 64715 64715 64715 64911 64911 0 0 0 512 0 0 0 512 0 0 0 0 0 0 65535
""" , """Exif.Canon.AFInfo Short 273 546 2 63 61 6720 4480 6720 4480 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 0 0 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 218 0 0 65200 64790 64435 64099 63764 336 0 65200 64099 63764 1772 1437 1101 746 336 0 1437 1101 746 336 0 65200 64790 64435 336 0 65200 64790 64435 64099 63764 1772 64790 64435 64099 63764 1772 1437 1101 746 63764 1772 1437 1101 746 336 0 65200 1101 746 336 0 65200 64790 64435 64099 336 0 65200 1772 1437 0 0 547 625 625 625 625 821 821 821 308 308 625 625 625 625 547 547 308 308 308 274 274 274 308 308 0 0 0 0 0 0 0 308 65228 65228 65228 65228 0 0 0 0 64911 65228 65228 65228 65228 65262 65262 65262 64911 64911 64989 64989 64989 64911 64911 64911 64715 64715 64715 64911 64911 0 0 0 512 0 0 0 512 0 0 0 0 0 0 65535
Exif.Canon.AFInfoSize SShort 1 546
Exif.Canon.AFAreaMode SShort 1 Single-point AF
Exif.Canon.AFNumPoints SShort 1 63
@@ -50,18 +50,18 @@ Exif.Canon.AFPointsSelected Short 4 25
Exif.Canon.AFPointsUnusable Short 4 (none)
Exif.Canon.AFMicroAdj Long 11 44 2 0 10 4294967295 0 10 0 10 0 10
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
Exif.Canon.AFNumPoints SShort 1 63
""","""Exif.Canon.AFNumPoints SShort 1 63
Exif.Canon.AFValidPoints SShort 1 61
Exif.Canon.AFPointsInFocus Short 4 0 560 57344 0
Exif.Canon.AFPointsSelected Short 4 0 1848 57344 0
Exif.Canon.AFPointsUnusable Short 4 0 0 0 0
Exif.Canon.AFNumPoints SShort 1 63
""","""Exif.Canon.AFNumPoints SShort 1 63
Exif.Canon.AFValidPoints SShort 1 61
Exif.Canon.AFPointsInFocus Short 4 20,21,25,45,46,47
Exif.Canon.AFPointsSelected Short 4 19,20,21,24,25,26,45,46,47
Exif.Canon.AFPointsUnusable Short 4 (none)
Exif.Canon.AFPointsUnusable Short 4 3608 49152 792 6272
Exif.Canon.AFPointsUnusable Short 4 3,4,9,10,11,30,31,35,36,40,41,55,59,60
""","""Exif.Canon.AFPointsUnusable Short 4 3608 49152 792 6272
""","""Exif.Canon.AFPointsUnusable Short 4 3,4,9,10,11,30,31,35,36,40,41,55,59,60
"""
]
stderr = [""]*len(commands)
+1
View File
@@ -164,6 +164,7 @@ Exif.CanonCs.FlashActivity Short 1 Did not fire
Exif.CanonCs.FlashDetails Short 1 E-TTL
Exif.CanonCs.ManualFlashOutput Short 1 n/a
Exif.Canon.CanonFlashInfo Short 4 0 0 0 0
Exif.CanonSi.ExposureCompensation Short 1 0
Exif.CanonSi.FlashGuideNumber Short 1 0
Exif.CanonSi.FlashBias Short 1 0 EV
Exif.CanonSi.AutoExposureBracketing Short 1 Off