include test of shutter mode and mech shutter count in lensdata 8 test

tests/bugfixes/github/test_pr_1437.py

@@ -2,12 +2,15 @@
 
 import system_tests
 
+# extended to also test include shutter mode and mechanical shutter count (pr 1444)
 class Nikon_LensData8(metaclass=system_tests.CaseMeta):
     url      = "https://github.com/Exiv2/exiv2/pull/1437"
     filename = "$data_path/CH0_0174.exv"
-    commands = ["$exiv2 -g lens/i -g aperture/i $filename"]
+    commands = ["$exiv2 -g lens/i -g aperture/i -g shutter/i $filename"]
     stderr   = [""]
-    stdout   = ["""Exif.Nikon3.LensType                         Byte        1  D G VR
+    stdout   = ["""Exif.Nikon3.ShutterMode                      Short       1  Auto (Electronic Front Curtain)
+Exif.Nikon3.MechanicalShutterCount           Long        1  174
+Exif.Nikon3.LensType                         Byte        1  D G VR
 Exif.Nikon3.Lens                             Rational    4  70-200mm F2.8
 Exif.Nikon3.LensFStops                       Undefined   4  6
 Exif.NikonLd4.AFAperture                     Byte        1  F2.8
@@ -18,6 +21,7 @@ Exif.NikonLd4.MaxApertureAtMaxFocal          Byte        1  F2.8
 Exif.NikonLd4.EffectiveMaxAperture           Byte        1  F2.8
 Exif.NikonLd4.LensID                         Short       1  0
 Exif.NikonLd4.MaxAperture                    Short       1  F0.5
+Exif.Nikon3.ShutterCount                     Long        1  174
 Exif.Photo.LensSpecification                 Rational    4  700/10 2000/10 280/100 280/100
 Exif.Photo.LensMake                          Ascii       6  
 Exif.Photo.LensModel                         Ascii      65  

tests/bugfixes/github/test_pr_1444.py

@@ -1,14 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import system_tests
-
-class Nikon_ShutterMode_MechShutterCount(metaclass=system_tests.CaseMeta):
-    url      = "https://github.com/Exiv2/exiv2/pull/1444"
-    filename = "$data_path/CH0_0174.exv"
-    commands = ["$exiv2 -g shutter/i $filename"]
-    stderr   = [""]
-    stdout   = ["""Exif.Nikon3.ShutterMode                      Short       1  Auto (Electronic Front Curtain)
-Exif.Nikon3.MechanicalShutterCount           Long        1  174
-Exif.Nikon3.ShutterCount                     Long        1  174
-"""]
-    retval = [0]